Automerger Merge Worker
fce0d92ce4
Merge "Have vold inform keymaster that early boot ended" am: 68b9fb10ae
...
Change-Id: Ic113eea7d3282084f1eae308ae1b6df931bd7a8c
2020-02-12 04:25:19 +00:00
Treehugger Robot
68b9fb10ae
Merge "Have vold inform keymaster that early boot ended"
2020-02-12 04:07:43 +00:00
Automerger Merge Worker
3660bf983c
Merge "Update vold to use KM4.1" am: 6c5f302a90
am: 53f8e2df82
...
Change-Id: I808df576abeec8ce2dd5fc8ea9d4784f4c8b6b0d
2020-02-12 01:11:28 +00:00
Automerger Merge Worker
53f8e2df82
Merge "Update vold to use KM4.1" am: 6c5f302a90
...
Change-Id: I5393adf2503586c87414a302fa24d381863bccbf
2020-02-12 01:06:54 +00:00
Treehugger Robot
6c5f302a90
Merge "Update vold to use KM4.1"
2020-02-12 00:56:18 +00:00
Shawn Willden
2b1ff5aaab
Have vold inform keymaster that early boot ended
...
Just before mounting partition(s) not verified by verified boot, vold
should notify keymaster that early boot has ended so it won't allow
EARLY_BOOT_ONLY keys to be created or used.
Test: VtsHalKeymasterV4_1TargetTest
Change-Id: I74ffec8d5b33f01e62f845a8fc824b3a3cad50f3
Merged-In: I74ffec8d5b33f01e62f845a8fc824b3a3cad50f3
2020-02-11 15:51:04 -07:00
Shawn Willden
35f0f22c9b
Update vold to use KM4.1
...
This CL updates vold to use the Keymaster 4.1 interface, but does not
yet call any of the new methods.
Test: Boot the device
Change-Id: I4574a2f6eead3b71d1e89488b496b734694620c7
Merged-In: I4574a2f6eead3b71d1e89488b496b734694620c7
2020-02-11 15:51:04 -07:00
Automerger Merge Worker
1541f9f32b
Merge "Use std::string to return crypto device, not char *" am: 80731b0975
am: 2381810b99
...
Change-Id: Ic7683749f4974ccdf251b7351110a1e3663536b7
2020-02-11 01:03:00 +00:00
Automerger Merge Worker
2381810b99
Merge "Use std::string to return crypto device, not char *" am: 80731b0975
...
Change-Id: I4cdc6e59713a945f9fc7b6e9d8c765e78c44b9cb
2020-02-11 00:49:53 +00:00
Paul Crowley
80731b0975
Merge "Use std::string to return crypto device, not char *"
2020-02-11 00:37:26 +00:00
Automerger Merge Worker
ebbabdc8fb
Merge "Refactor: make cryptfs.h smaller" am: 98c501d28e
am: 645c2f40a0
...
Change-Id: I5fb7f528186b6a678a02febd9e866ca4ae467dd4
2020-02-08 02:15:04 +00:00
Automerger Merge Worker
645c2f40a0
Merge "Refactor: make cryptfs.h smaller" am: 98c501d28e
...
Change-Id: I85d5bacfc08245397cb4f8aa71406bfeed961c19
2020-02-08 01:50:57 +00:00
Treehugger Robot
98c501d28e
Merge "Refactor: make cryptfs.h smaller"
2020-02-08 01:34:29 +00:00
Paul Crowley
81796e9dce
Use std::string to return crypto device, not char *
...
Bug: 147814592
Test: can create private volume on Cuttlefish
Change-Id: Ic2bca81c0f0319e1b988e9204a2f4e91af57d157
2020-02-07 11:27:49 -08:00
Paul Crowley
73be12dcd5
Refactor: make cryptfs.h smaller
...
Move most of it into cryptfs.cpp, and include cryptfs.h in fewer files.
Bug: 147814592
Test: Treehugger
Change-Id: Ia3592d73e7abc1f07a60538e0978a3033bdea7de
2020-02-07 11:16:12 -08:00
Automerger Merge Worker
5aac6ab55f
Merge changes from topics "dm-default-key-v2", "metadata_cipher" am: f60e947438
am: 0560c27092
...
Change-Id: I0c34298e89be72caf597c964ceeb7f3396abe20b
2020-02-01 16:29:52 +00:00
Automerger Merge Worker
0560c27092
Merge changes from topics "dm-default-key-v2", "metadata_cipher" am: f60e947438
...
Change-Id: I3e27ed3481542e5e6fe0db2c872d745151e50765
2020-02-01 16:19:45 +00:00
Treehugger Robot
f60e947438
Merge changes from topics "dm-default-key-v2", "metadata_cipher"
...
* changes:
Set metadata cipher in fstab
Add support for v2 of dm-default-key
2020-02-01 16:12:30 +00:00
Automerger Merge Worker
48c403b820
Merge "Rename key_dir to metadata_key_dir and refactor" am: a7463139cd
am: 8cf1eda025
...
Change-Id: I0933c434c9c63e15f8af648aa99250eea95aa3bd
2020-01-31 22:14:21 +00:00
Automerger Merge Worker
8cf1eda025
Merge "Rename key_dir to metadata_key_dir and refactor" am: a7463139cd
...
Change-Id: I14535278f6e2b0ffe6c322a2e9bd7e2ae608105f
2020-01-31 21:59:05 +00:00
Paul Crowley
a7463139cd
Merge "Rename key_dir to metadata_key_dir and refactor"
2020-01-31 21:49:13 +00:00
Paul Crowley
84e84c5f33
Set metadata cipher in fstab
...
Bug: 147814592
Test: Cuttlefish can use adiantum
Change-Id: I6805ae4acff4dd1ff7cecff9153dbf29e0274165
2020-01-30 17:20:27 -08:00
Paul Crowley
92a14b6b16
Add support for v2 of dm-default-key
...
Version 2 of dm-default-key has an extra parameter and always sets the
DUN.
Bug: 147814592
Test: Cuttlefish boots with keydirectory flag
Test: Crosshatch formatted before this change boots after it
Change-Id: I59081e385324d2e34a5f252286a97938d6ffb79b
2020-01-30 17:20:27 -08:00
Paul Crowley
c9b92f0c17
Rename key_dir to metadata_key_dir and refactor
...
Bug: 147814592
Test: Crosshatch boots
Change-Id: I9fce0ea5da9c81c2e4e9cf97b75c1cba821adf9e
2020-01-30 16:02:37 -08:00
Automerger Merge Worker
23fdbc7937
Merge "Refactor to use EncryptionPolicy everywhere we used to use raw_ref" am: fda79ddd82
am: 7c3b0af05e
...
Change-Id: Id0b36a8bd1d7db487eb61823f27c5349581bf781
2020-01-29 00:39:55 +00:00
Paul Crowley
7c3b0af05e
Merge "Refactor to use EncryptionPolicy everywhere we used to use raw_ref"
...
am: fda79ddd82
Change-Id: I0d1599b8a2baa141e1d08029f75e5e54f486cb14
2020-01-28 16:29:00 -08:00
Paul Crowley
fda79ddd82
Merge "Refactor to use EncryptionPolicy everywhere we used to use raw_ref"
2020-01-29 00:18:44 +00:00
Paul Crowley
77df7f207d
Refactor to use EncryptionPolicy everywhere we used to use raw_ref
...
Test: Boots, no bad log messages: Cuttlefish with v2 policies, Taimen
Bug: 147733587
Change-Id: Ice4acac3236b6b7d90e60a2f57b46814aa1949f5
2020-01-28 11:17:58 -08:00
Automerger Merge Worker
d88fba70c7
Merge "vold: Do not cache CE keys in vold" am: 432ca5af06
am: 8427b24fc5
...
Change-Id: I52ee506f94ccab65fd3cc26a5fb0366e49e3d178
2020-01-24 17:30:14 +00:00
Automerger Merge Worker
8427b24fc5
Merge "vold: Do not cache CE keys in vold" am: 432ca5af06
...
Change-Id: I2ca8cd6aec19e5f736d4a796ed882ce5d704ded9
2020-01-24 17:16:28 +00:00
Paul Crowley
432ca5af06
Merge "vold: Do not cache CE keys in vold"
2020-01-24 17:02:49 +00:00
Automerger Merge Worker
b9d3f62a36
Merge "Add support for casefolding and project quotas" am: f66ed18972
am: 37d8af2621
...
Change-Id: Ie233ba8045f5d294aa52476410e56335da2d8a52
2020-01-24 02:42:20 +00:00
Automerger Merge Worker
37d8af2621
Merge "Add support for casefolding and project quotas" am: f66ed18972
...
Change-Id: I5cba75000bcdbbc3bd3c6778994fea09d135aa2b
2020-01-24 02:27:01 +00:00
Daniel Rosenberg
f66ed18972
Merge "Add support for casefolding and project quotas"
2020-01-24 02:11:30 +00:00
Barani Muthukumaran
b1927c2a0a
vold: Do not cache CE keys in vold
...
CE keys were cached in vold to support untrusted reset
by a device admin, this is now supported by Locksettingservice
using synthetic password. This change requires a secret to be
provided to retrieve the CE key and re-wrap without the secret
when user removes the credential.
Test: Set credential, remove credential, swipe to none
and vice-versa.
Bug: 26948053
Merged-In: I4cb1c035a472477e70c1ff5bf0b2c3fcfad495e5
Change-Id: I4cb1c035a472477e70c1ff5bf0b2c3fcfad495e5
2020-01-24 00:20:22 +00:00
Automerger Merge Worker
3c78c789d6
Merge "Fixed a wrong AIDL import path" am: aa038e2f4d
am: b35ead2c3a
...
Change-Id: Ib43192a85298925ad4b7220a79930c2baaac5361
2020-01-23 03:41:43 +00:00
Jiyong Park
b35ead2c3a
Merge "Fixed a wrong AIDL import path"
...
am: aa038e2f4d
Change-Id: I8f3bf6b512ac1a0509ceb17cfa35efd0af6581b8
2020-01-22 19:27:04 -08:00
Treehugger Robot
aa038e2f4d
Merge "Fixed a wrong AIDL import path"
2020-01-23 00:57:58 +00:00
Jiyong Park
50c3ab6ac1
Fixed a wrong AIDL import path
...
AIDL import path should point to a root directory where relative path to
an AIDL file encodes the fully qualified name of the type in the file.
Since libvold_binder imports types like
android.os.incremental.IncrementalFileSystemControlParcel which are
under frameworks/base/core/java, the import path should set to the path,
not to the sub directory that directly has the AIDL files.
Bug: 147918827
Test: m
Change-Id: Ic4941578813eced5a7eb59a0656c10b76e902515
2020-01-20 12:37:52 +09:00
Automerger Merge Worker
17a1295297
Merge changes I1bbf480c,Icf2059cc am: 701a99834f
am: 16f46cd3d5
...
Change-Id: I3bd7beaa23e058b1d22ba86debd82fe727f4a92e
2020-01-17 17:53:48 +00:00
Automerger Merge Worker
16f46cd3d5
Merge changes I1bbf480c,Icf2059cc am: 701a99834f
...
Change-Id: I958b327f69f52cebf0e54e99b3c174ae30bce455
2020-01-17 17:40:39 +00:00
Oli Lan
701a99834f
Merge changes I1bbf480c,Icf2059cc
...
* changes:
Allow search permission on apex data directories.
Change ownership of apex data directories to root.
2020-01-17 17:20:36 +00:00
Oli Lan
e1b3f5cd2d
Allow search permission on apex data directories.
...
This gives x permission to all on the parent apex data directory
so that the data directories can be accessed by modules.
Bug: 147848983
Test: Build & flash, check permissions are correct
Change-Id: I1bbf480cbf9f9e758353237e333317516ad375ee
2020-01-17 11:37:31 +00:00
Oli Lan
9cfc404c2d
Change ownership of apex data directories to root.
...
The apex data directories must be accessed by apexd in order for it to
perform snapshot and restore as part of the rollback process. As apexd
runs as root, this CL changes the apex data directories under misc_[ce|de]
to be owned by root.
Bug: 141148175
Test: Build and flash; check permissions are set correctly.
Change-Id: Icf2059cc9448364f834eef7892914a99883746a1
2020-01-17 11:11:06 +00:00
Automerger Merge Worker
0925b02603
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 1119e4b809
...
Change-Id: Ib3631a92cc1b913d1ff6a80ae70e6eff6da8c067
2020-01-16 01:46:00 +00:00
Xin Li
1119e4b809
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
...
Bug: 146167222
Change-Id: Ia5363ad8550ac868591e4e7cd49ee62670d3caef
2020-01-15 15:59:18 -08:00
Daniel Rosenberg
477f3e5f4a
Add support for casefolding and project quotas
...
This enables ext4 casefolding and project quotas for adopted storage
cards.
Test: Enable virtual sdcard, adopt, check options on formatted disk
Bug: 138321217
Bug: 138322712
Change-Id: I99c09283cd78c30237cf18ad9ae9384ba0c05396
2020-01-14 18:11:56 -08:00
Automerger Merge Worker
c8425b0e8c
Merge "Fix the overflow issue in Checkpoint" am: 6492a6abf6
am: e4c34d9cc3
...
Change-Id: I82dece7b2fe00a31810120d63902048b2ffa6e8d
2020-01-14 21:14:50 +00:00
Qilin Tan
e4c34d9cc3
Merge "Fix the overflow issue in Checkpoint"
...
am: 6492a6abf6
Change-Id: I8991fd3bbe742fb87bc26bb6831280a73a2d5afb
2020-01-14 13:03:10 -08:00
Treehugger Robot
6492a6abf6
Merge "Fix the overflow issue in Checkpoint"
2020-01-14 20:47:23 +00:00