OSDN Git Service
Treehugger Robot [Fri, 17 Jul 2020 18:38:05 +0000 (18:38 +0000)]
Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am:
5de675c93b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1365586
Change-Id: Ibb6947f1fad7a31cf2a42c3604c76fcf45a7082a
Treehugger Robot [Fri, 17 Jul 2020 18:24:51 +0000 (18:24 +0000)]
Merge "vold: restore -D__ANDROID_DEBUGGABLE__"
Mark Salyzyn [Fri, 17 Jul 2020 15:17:50 +0000 (08:17 -0700)]
vold: restore -D__ANDROID_DEBUGGABLE__
Regression introduced by
commit
7ebcc2bcfde2cf6713e2975224034b06ba0943d8
("Revert "[Vold] Conditional dependency to ARC++ ObbVolume"")
errantly removed the product_variables support for
-D__ANDROID_DEBUGGABLE__ when built for userdebug builds.
Restore stanza.
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug:
161454607
Test: adb-remount-test no longer reports a problem
Change-Id: Ia7e55d1174fa7fac2d934d4aac06d15e8be388af
Eric Biggers [Fri, 17 Jul 2020 01:38:51 +0000 (01:38 +0000)]
Merge "KeyUtil: use static local variable in isFsKeyringSupported()" am:
256b23b1c5
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1365220
Change-Id: I94b778955b2ee5cd8c462050e94c39ce05c96179
Eric Biggers [Fri, 17 Jul 2020 01:38:44 +0000 (01:38 +0000)]
Merge "vold: drop local fscrypt UAPI definitions" am:
47425d05a9
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1365221
Change-Id: If47e4ced3b37e44772d802fb8ebe2d9ad51c03e2
Eric Biggers [Fri, 17 Jul 2020 01:20:43 +0000 (01:20 +0000)]
Merge "KeyUtil: use static local variable in isFsKeyringSupported()"
Eric Biggers [Fri, 17 Jul 2020 01:19:39 +0000 (01:19 +0000)]
Merge "vold: drop local fscrypt UAPI definitions"
Eric Biggers [Thu, 16 Jul 2020 23:31:00 +0000 (16:31 -0700)]
vold: drop local fscrypt UAPI definitions
Now that Bionic's copy of <linux/fscrypt.h> has been updated, there's no
need for vold to carry its own fscrypt_uapi.h.
Test: build
Change-Id: I61581ac74f7cf77bc8a835e64d96553a9d0c517a
Eric Biggers [Thu, 16 Jul 2020 21:29:59 +0000 (14:29 -0700)]
KeyUtil: use static local variable in isFsKeyringSupported()
Use C++'s built-in mechanism for one-time initialization rather than
implement it ourselves in a way that isn't thread-safe.
(It doesn't *actually* need to be thread-safe, since all callers of this
run under ACQUIRE_CRYPT_LOCK. But that's not easy to verify.)
Test: booted Cuttlefish and checked log for the one-time message
"Detected support for FS_IOC_ADD_ENCRYPTION_KEY"
Change-Id: I6ca5b143ca305fa95144e388efc9657e3507bf05
Eric Biggers [Thu, 16 Jul 2020 20:45:57 +0000 (20:45 +0000)]
Merge "vold: remove checkEncryption" am:
2d9777bfbf
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1363339
Change-Id: I4ffa4a351292c18dce51247d926ffe7efdbd5bea
Eric Biggers [Thu, 16 Jul 2020 20:30:35 +0000 (20:30 +0000)]
Merge "vold: remove checkEncryption"
Treehugger Robot [Thu, 16 Jul 2020 11:51:01 +0000 (11:51 +0000)]
Merge "Revert "[Vold] Conditional dependency to ARC++ ObbVolume"" am:
6e6fc6b8d3
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1320919
Change-Id: I6fb0ca30c54791549923099c1acf74667e06ae5b
Treehugger Robot [Thu, 16 Jul 2020 11:04:04 +0000 (11:04 +0000)]
Merge "Revert "[Vold] Conditional dependency to ARC++ ObbVolume""
Eric Biggers [Wed, 15 Jul 2020 18:06:02 +0000 (11:06 -0700)]
vold: remove checkEncryption
The testing-only "checkEncryption" command has been replaced with
VtsKernelEncryptionTest [1]. In particular, the metadata encryption
documentation [2] no longer mentions checkEncryption but rather
recommends running VtsKernelEncryptionTest. Also, checkEncryption
hasn't really been maintained, and it has some known bugs; it's unclear
that many people ever really used it.
So, just remove it.
[1] https://android.googlesource.com/platform/test/vts-testcase/kernel/+/refs/heads/master/encryption/
[2] https://source.android.com/security/encryption/metadata#tests
Bug:
155037012
Change-Id: I258829c60768fd11aafdf2faad956cecc1ae9826
Satoshi Niwa [Mon, 1 Jun 2020 12:03:36 +0000 (21:03 +0900)]
Revert "[Vold] Conditional dependency to ARC++ ObbVolume"
This reverts commit
aedae617fec702add64201534a2f514fa31c5965.
Reason for revert: ArcObbVolume is not needed by ARCVM R and above.
Bug:
157885448
Test: trybot
Change-Id: I16395ac8b6902cedea263f51e306b297d719043f
Eric Biggers [Tue, 7 Jul 2020 17:24:35 +0000 (17:24 +0000)]
Merge "vold: only allow emmc_optimized on eMMC storage" am:
428ae6e90a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1356175
Change-Id: I95f471e6a2a96929b1ff854cac195b68e86309f3
Eric Biggers [Tue, 7 Jul 2020 17:07:58 +0000 (17:07 +0000)]
Merge "vold: only allow emmc_optimized on eMMC storage"
Eric Biggers [Mon, 6 Jul 2020 20:46:38 +0000 (13:46 -0700)]
vold: only allow emmc_optimized on eMMC storage
The emmc_optimized encryption flag is specifically designed for the
limitations of inline encryption hardware that follows the eMMC
standard. It isn't appropriate to use on other types of storage.
So, make vold enforce that it's not used on other types of storage.
Bug:
160639344
Test:
- Enabled emmc_optimized on Cuttlefish and verified it no longer boots
- Using a modified version of this change, verified that
IsEmmcStorage() works as expected on various devices including
Cuttlefish, Cuttlefish booted in GSI image mode, a device with eMMC
storage, and a device with UFS storage.
- Verified that VtsKernelEncryptionTest still passes
Change-Id: Ie27b80658db53b1a4207b3cbb4e309d05130812e
Paul Lawrence [Thu, 18 Jun 2020 22:00:47 +0000 (22:00 +0000)]
Merge "Don't call block checkpoint functions above dm-default-key" am:
1bb7e8a928
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1330879
Change-Id: Ifa48af749baa5d50c7459dbb5bda1573d847b622
David Anderson [Thu, 18 Jun 2020 22:00:37 +0000 (22:00 +0000)]
Merge "Add an isCheckpointing() binder call for adb remount." am:
b50480bb96
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1330854
Change-Id: I14674da2b3cf86c09179b94e28e76fec30378e12
Paul Lawrence [Thu, 18 Jun 2020 21:56:10 +0000 (21:56 +0000)]
Merge "Don't call block checkpoint functions above dm-default-key"
David Anderson [Thu, 18 Jun 2020 21:45:21 +0000 (21:45 +0000)]
Merge "Add an isCheckpointing() binder call for adb remount."
Paul Lawrence [Fri, 12 Jun 2020 15:12:48 +0000 (08:12 -0700)]
Don't call block checkpoint functions above dm-default-key
Bug:
156225476
Test: Build for f2fs and ext4 device, make sure checkpoints roll back
and commit
Change-Id: Ic15fadc67d306463dd0b554f679306d8f9081451
David Anderson [Thu, 11 Jun 2020 06:51:17 +0000 (23:51 -0700)]
Add an isCheckpointing() binder call for adb remount.
This is needed so "adb remount" can avoid writing to /data during a
checkpoint.
Bug:
157540389
Test: manual test
Change-Id: I33a691da3b99343acfc1e8ddf68a14504c3bfbe1
Treehugger Robot [Tue, 2 Jun 2020 19:20:44 +0000 (19:20 +0000)]
Merge "Record use of metadata encryption in property" am:
f20a16575f
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1322598
Change-Id: I7b102707853ea2556c5a24858ae43ea5c2717616
Treehugger Robot [Tue, 2 Jun 2020 19:04:12 +0000 (19:04 +0000)]
Merge "Record use of metadata encryption in property"
Paul Crowley [Mon, 23 Mar 2020 15:59:12 +0000 (08:59 -0700)]
Record use of metadata encryption in property
Bug:
152150018
Test: Cuttlefish with and without keydirectory option
Cherry-Picked-From:
94abae03a97bf67bc2cd04b6a74e07ed08bf30a0
Merged-In: I400873ec207cb63f0407fefc83962bb3a927e294
Change-Id: I400873ec207cb63f0407fefc83962bb3a927e294
Treehugger Robot [Wed, 20 May 2020 07:08:04 +0000 (07:08 +0000)]
Merge "Handle virtio in private fs mapping" am:
e471d11d46
Change-Id: If088b875ff4cbca66fe9c6f9224b437edc85dae8
Treehugger Robot [Wed, 20 May 2020 06:32:43 +0000 (06:32 +0000)]
Merge "Handle virtio in private fs mapping"
Alistair Delva [Tue, 19 May 2020 22:49:26 +0000 (15:49 -0700)]
Handle virtio in private fs mapping
When the vold core decides if a device is SD or USB, it checks for MMC
or virtio, however when the filesystem type is decided, it does not
check for virtio, only MMC. This causes virtio SD cards to be formatted
with ext4 unconditionally.
This fix is independently correct, but it incidentally gets adopted
storage working on cuttlefish (and Android Emulator) because f2fs can
support fscrypt and casefolding at the same time; ext4 currently cannot.
Bug:
156286088
Change-Id: I0b41670d5f76b2506dad437917c2276f8e0aaccf
Merged-In: I0b41670d5f76b2506dad437917c2276f8e0aaccf
Treehugger Robot [Sat, 16 May 2020 05:13:11 +0000 (05:13 +0000)]
Merge "Expand virtio_block check to other virtual devices" am:
ff9975c04f
Change-Id: Ic604273ddef8ac356e1e23fba050da7d68a24871
Treehugger Robot [Sat, 16 May 2020 04:51:28 +0000 (04:51 +0000)]
Merge "Expand virtio_block check to other virtual devices"
Alistair Delva [Thu, 14 May 2020 23:35:03 +0000 (16:35 -0700)]
Expand virtio_block check to other virtual devices
The Android Emulator isn't the only virtual device the virtio-block
detection code is useful for, and those platforms might not set any
discriminating properties to indicate that they are virtual.
Rework the virtio-block major detection to use /proc/devices instead
of hardcoding the assumption that any virtual platform can have
virtio-block at any experimental major; the new code permits only the
exact experimental major assigned to virtio-block.
The new code runs everywhere, but it will only run once and could be
expanded later to detect dynamic or experimental majors.
Bug:
156286088
Change-Id: Ieae805d08fddd0124a397636f04d99194a9ef7e5
Merged-In: Ieae805d08fddd0124a397636f04d99194a9ef7e5
Treehugger Robot [Tue, 12 May 2020 12:46:32 +0000 (12:46 +0000)]
Merge "Revert "ARC++ swap for AppFuseUtil"" am:
b6e2c14ed1
Change-Id: I3545346238ddaaec8c1a947f00aaeadd12dfd63b
Treehugger Robot [Tue, 12 May 2020 12:30:16 +0000 (12:30 +0000)]
Merge "Revert "ARC++ swap for AppFuseUtil""
Satoshi Niwa [Fri, 8 May 2020 04:50:34 +0000 (04:50 +0000)]
Revert "ARC++ swap for AppFuseUtil"
This reverts commit
dcbd4fcad2b90a6e9376bfe2593ab941966db346.
Reason for revert: ARC is migrating to ARCVM on R, which doesn't use AppFuse any more.
Change-Id: Ifd0bf92a79c0ff25d782bea44dd593f9502f1959
Treehugger Robot [Wed, 6 May 2020 17:22:38 +0000 (17:22 +0000)]
Merge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure." am:
e8acc83d25
Change-Id: I1fb2dbb0de98e3e2deadce25183aa37f2bc7c4ba
Treehugger Robot [Wed, 6 May 2020 17:02:43 +0000 (17:02 +0000)]
Merge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure."
P.Adarsh Reddy [Thu, 16 Apr 2020 16:16:08 +0000 (21:46 +0530)]
Acknowledge the 'nofail' fs_mgr flag and skip the expected failure.
fs_mgr supports 'nofail' flag, which is used if we do not want to
error-out incase the mounting/setup fails for a partition tagged with
nofail flag in fstab.
Recently added code in vold misses this handling, i.e. it aborts even
for a nofail partition upon encountering an expected failure.
Test: Add a non-existing logical partition fstab entry with 'nofail'
flag. Init's first stage mount acks this and doesn't crash.
Vold aborts (as it doesn't handle it), and device doesn't boot.
With this change, device boots up.
Change-Id: I2b1904a9c648c31bcc05b2e7e77480db236ff66e
Treehugger Robot [Thu, 23 Apr 2020 22:36:56 +0000 (22:36 +0000)]
Merge "vold: fix missing has.adoptable" am:
9e2053e185
Change-Id: I3f87b104678fb57c627165fcd5faea846e25d343
Treehugger Robot [Thu, 23 Apr 2020 22:15:38 +0000 (22:15 +0000)]
Merge "vold: fix missing has.adoptable"
Jaegeuk Kim [Thu, 23 Apr 2020 20:43:12 +0000 (13:43 -0700)]
vold: fix missing has.adoptable
This patch fixes missing entry in the below commit.
Fixes:
c52f6724edd6 ("vold: clean up configuration set")
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Ia39a427d4747b29a7af42633f34daab63204bbf9
Treehugger Robot [Tue, 21 Apr 2020 16:07:15 +0000 (16:07 +0000)]
Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" am:
83c78a2bb1
Change-Id: Icfcf0222bd97d52d6fed2eeef3c3fca335d8b93e
Treehugger Robot [Tue, 21 Apr 2020 15:51:20 +0000 (15:51 +0000)]
Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property"
Nikita Ioffe [Mon, 20 Apr 2020 21:21:49 +0000 (22:21 +0100)]
Introduce ro.crypto.uses_fs_ioc_add_encryption_key property
Bug:
154327249
Test: adb shell getprop ro.crypto.uses_fs_ioc_add_encryption_key
Test: adb bugreport && checked content contains new property
Change-Id: I562df49deffdccdb2cfd657130fc05b24d40a6a6
Merged-In: I562df49deffdccdb2cfd657130fc05b24d40a6a6
(cherry picked from commit
78f806198f85ca37abb617235c89abaca7d1c19c)
Martijn Coenen [Thu, 16 Apr 2020 08:21:00 +0000 (08:21 +0000)]
Merge "Rename casefold/projectid properties." am:
9d0508a854
Change-Id: If27cbdd3df8bb53b8e27a772be9b0826a8fce4e4
Martijn Coenen [Thu, 16 Apr 2020 08:06:53 +0000 (08:06 +0000)]
Merge "Rename casefold/projectid properties."
Martijn Coenen [Wed, 15 Apr 2020 09:42:47 +0000 (11:42 +0200)]
Rename casefold/projectid properties.
According to property naming guidelines.
Bug:
152170470
Bug:
153525566
Test: N/A
Change-Id: Iaebff2a835288839a2faf0edbe0e47ceb96b4458
Jaegeuk Kim [Tue, 14 Apr 2020 15:58:32 +0000 (15:58 +0000)]
Merge changes from topic "fscompression" am:
7f4a71c2ff
Change-Id: I42086b7abde79ae1edb177f3668c73b1c7972295
Jaegeuk Kim [Tue, 14 Apr 2020 15:58:30 +0000 (15:58 +0000)]
vold: support F2FS compression am:
f64d30aa82
Change-Id: I03d6c574c922f08c67a662e483a1ed05ea7c4351
Jaegeuk Kim [Tue, 14 Apr 2020 15:54:18 +0000 (15:54 +0000)]
Merge changes from topic "fscompression"
* changes:
vold: clean up configuration set
vold: support F2FS compression
Jaegeuk Kim [Mon, 6 Apr 2020 22:58:41 +0000 (15:58 -0700)]
vold: clean up configuration set
This patch introduces a structure to manipulate many configuration flags.
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Ib15d2b6e251741160d2febe695132a37f9dde23c
Xin Li [Fri, 10 Apr 2020 00:51:30 +0000 (17:51 -0700)]
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master
Bug:
151763422
Change-Id: I04b8a113f3194fc4de80da1f4c0f9551115e6529
Treehugger Robot [Thu, 9 Apr 2020 22:31:09 +0000 (22:31 +0000)]
Merge "Send earlyBootEnded notice to all Keymasters" am:
0e9fbe4a3e
Change-Id: Ia8f5e55336e3a4d0a71d353b2f28553cf6196bd6
Treehugger Robot [Thu, 9 Apr 2020 22:07:40 +0000 (22:07 +0000)]
Merge "Send earlyBootEnded notice to all Keymasters"
Shawn Willden [Wed, 1 Apr 2020 16:02:16 +0000 (10:02 -0600)]
Send earlyBootEnded notice to all Keymasters
Vold incorrectly sends the earlyBootEnded signal only to the Keymaster
instance used for device encryption, but all of them need it.
Bug:
152932559
Test: VtsHalKeymasterV4_1TargetTest
Merged-In: Id8f01a1dc7d2398395f369c3ea74656a82888829
Change-Id: Id8f01a1dc7d2398395f369c3ea74656a82888829
Paul Crowley [Tue, 7 Apr 2020 04:08:32 +0000 (04:08 +0000)]
Merge "Choose options format using property" am:
479588c68e am:
30c1b0225e
Change-Id: Id82ce73849059e7792422023afc66cba13833ecc
Paul Crowley [Tue, 7 Apr 2020 03:48:07 +0000 (03:48 +0000)]
Merge "Choose options format using property" am:
479588c68e
Change-Id: I67523617a54957da6a3fae7cd9233ff47627578d
Paul Crowley [Tue, 7 Apr 2020 03:23:57 +0000 (03:23 +0000)]
Merge "Choose options format using property"
Paul Crowley [Sun, 22 Mar 2020 15:02:06 +0000 (08:02 -0700)]
Choose options format using property
To make it easier to support disk formats created using old versions
of dm-default-key with new kernels, choose the disk format to use
based on options_format_version and first_api_version properties
instead of checking the version number of the kernel module.
Bug:
150761030
Test: crosshatch and cuttlefish boot normally; cuttlefish
fails with "default-key: Not enough arguments" as expected when
option is set to 1
Change-Id: Ib51071b7c316ce074de72439741087b18335048c
Jaegeuk Kim [Tue, 14 Jan 2020 19:22:26 +0000 (11:22 -0800)]
vold: support F2FS compression
Bug:
134580167
Change-Id: Iadd001dc5ce0f91a4337f5b27ea8cc54f9760b0d
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Yurii Zubrytskyi [Fri, 3 Apr 2020 18:10:50 +0000 (18:10 +0000)]
Merge "[vold] update with incfs_ndk.h" am:
29ee196fb5 am:
e296f9cbf6
Change-Id: I0173898669ca7d4b3a03449d2488f69cddb0ba3f
Yurii Zubrytskyi [Fri, 3 Apr 2020 17:49:01 +0000 (17:49 +0000)]
Merge "[vold] update with incfs_ndk.h" am:
29ee196fb5
Change-Id: If51dfb7c76c6593ecf31c2b42712c4ac114d2b83
Yurii Zubrytskyi [Fri, 3 Apr 2020 17:25:05 +0000 (17:25 +0000)]
Merge "[vold] update with incfs_ndk.h"
Songchun Fan [Wed, 4 Mar 2020 01:58:20 +0000 (17:58 -0800)]
[vold] update with incfs_ndk.h
BUG:
150470163
Test: atest PackageManagerShellCommandIncrementalTest
Change-Id: I5166c49cf48f353dab35e385571ada517cb751ac
Merged-In: I5166c49cf48f353dab35e385571ada517cb751ac
David Anderson [Mon, 30 Mar 2020 09:00:10 +0000 (09:00 +0000)]
[automerger skipped] Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously. am:
5ba8aeaa80 -s ours
am skip reason: Change-Id Id8616804bba622226ca21b8eff0d3eb577b4b7e0 with SHA-1
1dd5c4f787 is in history
Change-Id: I30e748f7983e661ba2abd9bbd2ec12dc453b1eb1
David Anderson [Tue, 11 Jun 2019 21:51:25 +0000 (14:51 -0700)]
Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously.
Bug:
134711825
Bug:
149462396
Test: StorageManagerTest
Change-Id: Id8616804bba622226ca21b8eff0d3eb577b4b7e0
Merged-In: Id8616804bba622226ca21b8eff0d3eb577b4b7e0
Yurii Zubrytskyi [Thu, 26 Mar 2020 07:59:46 +0000 (07:59 +0000)]
Merge changes from topic "merge-incremental-vold" am:
10a372f1d2 am:
41c1c40afc
Change-Id: I542b7a48e7d94b78bf3fb01e44263e2b161df60f
Yurii Zubrytskyi [Thu, 26 Mar 2020 07:59:44 +0000 (07:59 +0000)]
Expose new IncFS interface through Vold am:
d05bcc8070 am:
636da65360
Change-Id: I349002a3eb80d962c86b24f89816c4ce76d5d65e
Yurii Zubrytskyi [Thu, 26 Mar 2020 07:33:58 +0000 (07:33 +0000)]
Merge changes from topic "merge-incremental-vold" am:
10a372f1d2
Change-Id: Id6fe791310761aa715fdf0e37760052a1534a4f0
Yurii Zubrytskyi [Thu, 26 Mar 2020 07:33:56 +0000 (07:33 +0000)]
Expose new IncFS interface through Vold am:
d05bcc8070
Change-Id: Icbdb9f233850e70e8ca7c458fd30c4bea93a9923
Yurii Zubrytskyi [Thu, 26 Mar 2020 07:23:11 +0000 (07:23 +0000)]
Merge changes from topic "merge-incremental-vold"
* changes:
[vold] Add argument verification to IncFS methods
Expose new IncFS interface through Vold
Yurii Zubrytskyi [Tue, 24 Mar 2020 23:23:51 +0000 (16:23 -0700)]
[vold] Add argument verification to IncFS methods
+ Get rid of an extra string copy in path validation function
Bug:
152349257
Test: atest vold_tests
Change-Id: I03a8cab0dd6abd7d5c9dcbbc2acb651e818e6cd8
Merged-In: I03a8cab0dd6abd7d5c9dcbbc2acb651e818e6cd8
Yurii Zubrytskyi [Fri, 10 Jan 2020 19:54:06 +0000 (11:54 -0800)]
Expose new IncFS interface through Vold
CL is a part of multi-repository topic and will be merged
to AOSP
Bug:
146080380
Test: manual
Change-Id: I09b33a34ff1ac7f6e415b7bd090c22e7df24d72d
Merged-In: I09b33a34ff1ac7f6e415b7bd090c22e7df24d72d
Xin Li [Thu, 19 Mar 2020 04:22:43 +0000 (04:22 +0000)]
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@
6304901 into stag-aosp-master am:
4e13a60b8d
Change-Id: Ic6e88b868f1e8de04713198d892411caab957906
Xin Li [Thu, 19 Mar 2020 02:40:59 +0000 (19:40 -0700)]
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@
6304901 into stag-aosp-master
Bug:
151763422
Change-Id: I3f26efbcf61365bfac87aa83a0bc8a5dbb2d0a65
Automerger Merge Worker [Wed, 11 Mar 2020 20:31:30 +0000 (20:31 +0000)]
Merge "fskeyring & userspace reboot: support CE keys" am:
eaa3443ad8 am:
91ba0c8fa4
Change-Id: I393e9464b2579cfd9b59596a70ca8c3881e0582d
Automerger Merge Worker [Wed, 11 Mar 2020 20:12:14 +0000 (20:12 +0000)]
Merge "fskeyring & userspace reboot: support CE keys" am:
eaa3443ad8
Change-Id: Ib22499ed549567b9ad12cd0f9c0ef5197724fee0
Nikita Ioffe [Wed, 11 Mar 2020 16:10:35 +0000 (16:10 +0000)]
Merge "fskeyring & userspace reboot: support CE keys"
Nikita Ioffe [Fri, 28 Feb 2020 19:50:31 +0000 (19:50 +0000)]
fskeyring & userspace reboot: support CE keys
During userspace reboot /data might be unmounted & remounted, meaning
that CE keys stored in fs-level keyring will be lost. In order to be
able to restore them, when installing new key to fs-level keyring, it's
also added to session-level keyring with type "fscrypt-provisioning".
Then when init_user0 is called during userspace reboot, vold will try to
load CE keys from the session-level keyring back into fs-level keyring
for all the users that were unlocked before the reboot.
If for any user vold fails to install the key, init_user0 will fail and
fallback to hard reboot will be triggered.
Test: set a pin pattern
Test: adb shell setprop sys.init.userdata_remount.force_umount 1
Test: adb shell svc power reboot userspace
Test: atest CtsUserspaceRebootHostSideTestCases
Bug:
143970043
Change-Id: I37603dc136c7ededc7b0381e4d730cb0ffd912b4
Merged-In: I37603dc136c7ededc7b0381e4d730cb0ffd912b4
(cherry picked from commit
1ee35cf002de9f6aaa6f33e67d882cdbbaa35cc2)
Automerger Merge Worker [Thu, 5 Mar 2020 16:32:43 +0000 (16:32 +0000)]
Merge "Use the blk_device supplied by vdc encryptFstab" am:
3b3a13a81a am:
eeb005eb7d
Change-Id: If29abc839cb196072cccc7024b499ef5d54a0f45
Automerger Merge Worker [Thu, 5 Mar 2020 16:18:03 +0000 (16:18 +0000)]
Merge "Use the blk_device supplied by vdc encryptFstab" am:
3b3a13a81a
Change-Id: I7967532a151eb373b878e7723e73df67cce1061f
Paul Crowley [Thu, 5 Mar 2020 15:59:18 +0000 (15:59 +0000)]
Merge "Use the blk_device supplied by vdc encryptFstab"
Automerger Merge Worker [Wed, 4 Mar 2020 15:33:10 +0000 (15:33 +0000)]
Merge "fskeyring & userspace reboot: support DE keys" am:
3b719ed32e am:
ac589ee784
Change-Id: I50a54e3ac6a873930d2c3b0ee62ca389100b0787
Automerger Merge Worker [Wed, 4 Mar 2020 15:19:40 +0000 (15:19 +0000)]
Merge "fskeyring & userspace reboot: support DE keys" am:
3b719ed32e
Change-Id: I23ff1535eacf875561c6fef250b431fe17b6dc14
Nikita Ioffe [Wed, 4 Mar 2020 15:02:23 +0000 (15:02 +0000)]
Merge "fskeyring & userspace reboot: support DE keys"
Nikita Ioffe [Thu, 27 Feb 2020 18:21:55 +0000 (18:21 +0000)]
fskeyring & userspace reboot: support DE keys
During userspace reboot /data might be unmounted, which means that if
device supports filesystem keyring, DE keys will be lost and are needed
to be re-installed.
Test: adb shell setprop sys.init.userdata_remount.force_umount 1
Test: adb shell svc power reboot userspace
Test: atest CtsUserspaceRebootHostSideTestCases
Bug:
143970043
Change-Id: I153caa1d7c373b3c906a34f1184c681e52854a9d
Merged-In: I153caa1d7c373b3c906a34f1184c681e52854a9d
(cherry picked from commit
1eaea5a6a21a2eb9ec0debb69a8718861e13b4d7)
Automerger Merge Worker [Wed, 4 Mar 2020 05:09:52 +0000 (05:09 +0000)]
Merge "umount /data/user/0 before umount /data" am:
3a0fd35b62 am:
20f9f29d53
Change-Id: If73d45b2048ef3031f1f38180735ab542b7dbdfd
Automerger Merge Worker [Wed, 4 Mar 2020 04:53:16 +0000 (04:53 +0000)]
Merge "umount /data/user/0 before umount /data" am:
3a0fd35b62
Change-Id: Ibb3aa685585e8dab22f504a7f862cad5e551ca96
Treehugger Robot [Wed, 4 Mar 2020 04:34:46 +0000 (04:34 +0000)]
Merge "umount /data/user/0 before umount /data"
Hyangseok Chae [Thu, 27 Feb 2020 09:21:50 +0000 (18:21 +0900)]
umount /data/user/0 before umount /data
FDE device has shut down and restart the framework.
But restart is not triggered due to umount fail.
umount /data fail with "device is busy"
It is because bind mount /data/data to /data/user/0
We need umount /data/user/0 before umount /data
Bug:
148004718
Test: Flash GSI and check boot with FDE and FBE device.
Change-Id: I919f9e31a9d2d745b297a7ab99b399aa9b293b39
Paul Crowley [Mon, 2 Mar 2020 20:57:58 +0000 (12:57 -0800)]
Use the blk_device supplied by vdc encryptFstab
fs_mgr may put other dm devices on top of the raw disk, such as for
checkpointing, and it hands metadata encryption the uppermost device in
vdc. That's what should be encrypted, not the raw disk.
Bug:
150354860
Test: Treehugger
Change-Id: I279f087b1b7aded40c5a62281154851ce970ba70
Automerger Merge Worker [Thu, 27 Feb 2020 03:35:55 +0000 (03:35 +0000)]
Merge "Use optional for nullable types" am:
deb7085453 am:
c63694c6e1
Change-Id: I29d0ba8265692bc7234b4f72cd1c0fd0324c8834
Automerger Merge Worker [Thu, 27 Feb 2020 03:22:54 +0000 (03:22 +0000)]
Merge "Use optional for nullable types" am:
deb7085453
Change-Id: Iea4d8e042d65e2ed1befa6dc18c822f2982c41ab
Jooyung Han [Thu, 27 Feb 2020 03:06:14 +0000 (03:06 +0000)]
Merge "Use optional for nullable types"
Jooyung Han [Thu, 23 Jan 2020 04:23:26 +0000 (13:23 +0900)]
Use optional for nullable types
AIDL generates optional<T> for nullable T types for C++, which is more
efficient and idomatic and easy to use.
Bug:
144773267
Test: build/flash/boot
Merged-In: I98549c8614c9152d5d45e2f1f33f2f3c31a9bbbf
Change-Id: I98549c8614c9152d5d45e2f1f33f2f3c31a9bbbf
(cherry picked from commit
0568fd287cfc0affc8e985f21da3793cdda286a3)
Automerger Merge Worker [Wed, 19 Feb 2020 23:37:01 +0000 (23:37 +0000)]
Merge "Make CTS not HEH the default post Q" am:
39969f0288 am:
17d85205bd
Change-Id: I0c3114a77c37b30e542c45fc4d4d6ea592444b1a
Automerger Merge Worker [Wed, 19 Feb 2020 23:20:59 +0000 (23:20 +0000)]
Merge "Make CTS not HEH the default post Q" am:
39969f0288
Change-Id: I0cb0430214ab69656c6e7f3116194b63eb54672b
Treehugger Robot [Wed, 19 Feb 2020 23:04:37 +0000 (23:04 +0000)]
Merge "Make CTS not HEH the default post Q"
Paul Crowley [Tue, 18 Feb 2020 18:10:08 +0000 (10:10 -0800)]
Make CTS not HEH the default post Q
Making HEH the default was always a mistake and a giant foot-gun.
Let's make life easier for people by making the default depend on
first_api_level, so it's automatically set up right for new devices
without breaking old ones. Also use v2 fscrypt keys instead of v1 post
Q.
Bug:
147107322
Test: Various Cuttlefish configurations
Change-Id: I5432bdfd6fec6ed34e7f9ab7cdd32cdeb2a03472