OSDN Git Service
Martijn Coenen [Fri, 17 Apr 2020 08:10:15 +0000 (08:10 +0000)]
[automerger skipped] Rename casefold/projectid properties. am:
aee6b6fccd -s ours
am skip reason: Change-Id Iaebff2a835288839a2faf0edbe0e47ceb96b4458 with SHA-1
97ff0845e2 is in history
Change-Id: If48e613ce1fba64f6bf9bf8613ce93d76cf8b31f
Martijn Coenen [Thu, 16 Apr 2020 08:35:08 +0000 (08:35 +0000)]
Merge "Rename casefold/projectid properties." am:
9d0508a854 am:
5901d6f492
Change-Id: Ic9982c15351008ff686f9bf395ae8f3b4adcdb30
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 [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
Merged-In: Iaebff2a835288839a2faf0edbe0e47ceb96b4458
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 16:09:28 +0000 (16:09 +0000)]
Merge changes from topic "fscompression" am:
7f4a71c2ff am:
0f5df6477d
Change-Id: I3b1d5956b6c3783b14b203c1d6d234d6b97667f7
Jaegeuk Kim [Tue, 14 Apr 2020 16:09:24 +0000 (16:09 +0000)]
vold: support F2FS compression am:
f64d30aa82 am:
0770085201
Change-Id: I3bef3bef7704f7ef12a8774064ec1382fa4801d1
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 03:08:48 +0000 (03:08 +0000)]
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am:
b4a3c55026 -s ours
am skip reason: subject contains skip directive
Change-Id: I7f117d3116a53998624318365c8117df3ad4e3a6
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:52:28 +0000 (22:52 +0000)]
[automerger skipped] Merge "Send earlyBootEnded notice to all Keymasters" am:
0e9fbe4a3e am:
483de9f5fd -s ours
am skip reason: Change-Id Id8f01a1dc7d2398395f369c3ea74656a82888829 with SHA-1
50397a72f1 is in history
Change-Id: Ib4400fdb5f38dfb2ac9eb9b93318f34601101ddc
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
TreeHugger Robot [Wed, 8 Apr 2020 00:24:33 +0000 (00:24 +0000)]
[automerger skipped] Merge "Choose options format using property" into rvc-dev am:
0fbd0c1542 -s ours
am skip reason: Change-Id Ib51071b7c316ce074de72439741087b18335048c with SHA-1
f56d553bab is in history
Change-Id: I3500b37255c57f5dd74307801e9833ea6bdea08d
TreeHugger Robot [Wed, 8 Apr 2020 00:10:59 +0000 (00:10 +0000)]
Merge "Choose options format using property" into rvc-dev
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
Cherry-Picked-From:
f56d553babc368e557fe90513e78a5ba06626b0d
Merged-In: Ib51071b7c316ce074de72439741087b18335048c
Change-Id: Ib51071b7c316ce074de72439741087b18335048c
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 04:07:38 +0000 (04:07 +0000)]
Merge "Choose options format using property" am:
479588c68e am:
30c1b0225e
Change-Id: Ic6b4c8e252ea9f3285c0646c7ed26d0bb54a2a88
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
Alex Buynytskyy [Sat, 4 Apr 2020 04:08:57 +0000 (04:08 +0000)]
Additional operation check when enabling read logs. am:
605a44fe93
Change-Id: Ie068daae873a7796873e4170cd18617d8161916f
Alex Buynytskyy [Thu, 2 Apr 2020 22:21:47 +0000 (15:21 -0700)]
Additional operation check when enabling read logs.
Vold now does not check caller's permission, but only accepts
transactions from system_server. And it's up to system server to do the
right thing and check permissions/appops.
Bug: b/
152633648
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest
Test: adb shell appops set 1000 GET_USAGE_STATS deny
Change-Id: Id56c1673b135b72b3ec86e572aa4bcca3afc19ab
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 18:09:40 +0000 (18:09 +0000)]
[automerger skipped] Merge "[vold] update with incfs_ndk.h" am:
29ee196fb5 am:
e296f9cbf6 -s ours
am skip reason: Change-Id I5166c49cf48f353dab35e385571ada517cb751ac with SHA-1
01c4e91c09 is in history
Change-Id: I954834a99ef8253dee7ed1cd5d776dbc405427c6
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"
Linus Tufvesson [Fri, 3 Apr 2020 13:28:37 +0000 (13:28 +0000)]
Replace EnsureDirExists with a call to setupAppDir am:
75973cb0dd
Change-Id: I7cc9c77bd27c459684698069cd85f544d8cb2571
Linus Tufvesson [Mon, 23 Mar 2020 11:59:43 +0000 (11:59 +0000)]
Replace EnsureDirExists with a call to setupAppDir
Test: Manually verified ownership of /storage/emulated/0/Android/data on cf_x86_phone-userdebug after enabling feature
Bug:
151455752
Change-Id: I75a1e3b769476e56094e41d82e7f8e1a72827ded
Alex Buynytskyy [Thu, 2 Apr 2020 00:48:17 +0000 (00:48 +0000)]
Merge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev am:
6ce90ced12
Change-Id: I9b04f7a6201cf148c310dc7c1598c40076839f64
Alex Buynytskyy [Thu, 2 Apr 2020 00:36:26 +0000 (00:36 +0000)]
Merge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev
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
TreeHugger Robot [Wed, 1 Apr 2020 22:42:49 +0000 (22:42 +0000)]
Merge "Send earlyBootEnded notice to all Keymasters" into rvc-dev am:
be39b1d53e
Change-Id: Ice2298726632bc0e6299669d5e56e6d5470bce5b
TreeHugger Robot [Wed, 1 Apr 2020 22:31:35 +0000 (22:31 +0000)]
Merge "Send earlyBootEnded notice to all Keymasters" into rvc-dev
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
Change-Id: Id8f01a1dc7d2398395f369c3ea74656a82888829
Alex Buynytskyy [Tue, 31 Mar 2020 21:46:25 +0000 (14:46 -0700)]
Checking LOADER_USAGE_STATS before enabling read logs.
Bug: b/
152633648
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest
Change-Id: I29bf16d06a013566c8dd08e64be2a23ad805e37d
TreeHugger Robot [Tue, 31 Mar 2020 11:12:23 +0000 (11:12 +0000)]
Merge "Prefer f2fs for virtual (private) storage volumes." into rvc-dev am:
60d7c823ee
Change-Id: Id0dc7498977c658b397f1e24e6f5f11a8b141ed3
TreeHugger Robot [Tue, 31 Mar 2020 11:00:31 +0000 (11:00 +0000)]
Merge "Prefer f2fs for virtual (private) storage volumes." into rvc-dev
David Anderson [Mon, 30 Mar 2020 09:12:14 +0000 (09:12 +0000)]
[automerger skipped] Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously. am:
5ba8aeaa80 -s ours am:
87bf96a60e -s ours
am skip reason: Change-Id Id8616804bba622226ca21b8eff0d3eb577b4b7e0 with SHA-1
1dd5c4f787 is in history
Change-Id: If44408e84cabcadf9b3c7058375df4c5d976607e
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 [Mon, 30 Mar 2020 09:00:04 +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: Iaffd50d7b736066cfa429edf28b3f18fb956715d
Songchun Fan [Sun, 29 Mar 2020 17:15:03 +0000 (17:15 +0000)]
[vold] update with incfs_ndk.h am:
01c4e91c09
Change-Id: I3c917640ee14bdafeb012ca1ff59cab6c399d8a9
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
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:55:47 +0000 (07:55 +0000)]
[automerger skipped] Merge changes from topic "merge-incremental-vold" am:
10a372f1d2 am:
41c1c40afc -s ours
am skip reason: Change-Id I03a8cab0dd6abd7d5c9dcbbc2acb651e818e6cd8 with SHA-1
131365a3e5 is in history
Change-Id: Ic73870d77b44d60bd7bdcbb44ca43267fd456945
Yurii Zubrytskyi [Thu, 26 Mar 2020 07:55:45 +0000 (07:55 +0000)]
[automerger skipped] Expose new IncFS interface through Vold am:
d05bcc8070 am:
636da65360 -s ours
am skip reason: Change-Id I09b33a34ff1ac7f6e415b7bd090c22e7df24d72d with SHA-1
3497cb5be5 is in history
Change-Id: I71e68b76895658e5546f7c96678905b249ff8ffc
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 [Thu, 26 Mar 2020 04:25:24 +0000 (04:25 +0000)]
[vold] Add argument verification to IncFS methods am:
131365a3e5
Change-Id: I8a19bea4ca9c8f30f754cf7d43feba432152e204
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 [Wed, 25 Mar 2020 06:49:02 +0000 (23:49 -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
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
Martijn Coenen [Tue, 24 Mar 2020 08:51:18 +0000 (08:51 +0000)]
Merge "Bind mount Android/data and Android/obb individually." into rvc-dev am:
81872e826c
Change-Id: I1a454da8ca2f14c2e77f29d0b9e0f6e2a48528e1
Martijn Coenen [Tue, 24 Mar 2020 08:31:44 +0000 (08:31 +0000)]
Merge "Bind mount Android/data and Android/obb individually." into rvc-dev
TreeHugger Robot [Fri, 20 Mar 2020 14:48:23 +0000 (14:48 +0000)]
Merge "Add quota / casefold options to f2fs if needed." into rvc-dev am:
fe6253e3a2
Change-Id: Ia97181187e3eff582d2edf887b21811aa88ea7d2
TreeHugger Robot [Fri, 20 Mar 2020 14:35:07 +0000 (14:35 +0000)]
Merge "Add quota / casefold options to f2fs if needed." into rvc-dev
Martijn Coenen [Mon, 16 Mar 2020 13:37:33 +0000 (14:37 +0100)]
Bind mount Android/data and Android/obb individually.
Because we want all other paths (in particular Android/media) to go
through FUSE.
Also use scope_guard to make unwinding some failures easier.
Bug:
151272568
Test: atest AdoptableHostTest
Change-Id: Ib487b9071b5b212c7bb12ce54f80c96d98acaef5
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 04:19:36 +0000 (04:19 +0000)]
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@
6304901 into stag-aosp-master am:
4e13a60b8d -s ours
am skip reason: subject contains skip directive
Change-Id: I8ad9a8221d0713df7d28b42a46fe270bd6ffd134
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
Zim [Wed, 18 Mar 2020 09:55:44 +0000 (09:55 +0000)]
Fix vold wedge when unmounting Android/ am:
b6488f3f04
Change-Id: Iad3d05b416a9ace3986c3d9db35322fd2c8a099d
Zim [Tue, 17 Mar 2020 15:15:42 +0000 (15:15 +0000)]
Fix vold wedge when unmounting Android/
In EmulatedVolume#doMount, if some operations fail, we call
EmulatedVolume#doUnmount.
During this unmount we try to unmount Android/ causing a FUSE_LOOKUP
on the FUSE mount. If the FUSE mount is not up, this can hang.
Now we introduce a new state to prevent unmounting Android/ if it
wasn't mounted.
Test: atest AdoptableHostTest
Bug:
151685786
Change-Id: I6246d3910c352034d2a4fb09ad9c1e7fd91cba5e
Automerger Merge Worker [Mon, 16 Mar 2020 15:56:09 +0000 (15:56 +0000)]
Make storage dirs remount fork() safe am:
6b12257702
Change-Id: I589afb12062914cc3da9ff8f7c8dd43014ac6ce9
Ricky Wai [Fri, 28 Feb 2020 16:30:47 +0000 (16:30 +0000)]
Make storage dirs remount fork() safe
Also, use the pids provided by system server to remount all existing
processes, so we don't need to do the heavy and unreliable scanning in
/proc anymore.
Bug:
149548518
Test: atest AdoptableHostTest
Change-Id: Ifb5b79a3bc5438f36e0d61ec8aec96bdbc60ca13
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:30:41 +0000 (20:30 +0000)]
[automerger skipped] Merge "fskeyring & userspace reboot: support CE keys" am:
eaa3443ad8 am:
91ba0c8fa4 -s ours
am skip reason: Change-Id I37603dc136c7ededc7b0381e4d730cb0ffd912b4 with SHA-1
1ee35cf002 is in history
Change-Id: Idf341b045a9cebb52431265832821cf40f99cd26
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"
Martijn Coenen [Wed, 11 Mar 2020 14:33:22 +0000 (15:33 +0100)]
Prefer f2fs for virtual (private) storage volumes.
Since ext4 currently doesn't have the required kernel patches in place
on cuttlefish.
Bug:
150935323
Test: sm set-virtual-disk true
sm partition disk:7,xyz private
inspect mount output
Change-Id: Ief5bd9ace9d39bdfbae8d3857044a2143801f6be
Martijn Coenen [Tue, 10 Mar 2020 08:28:39 +0000 (09:28 +0100)]
Add quota / casefold options to f2fs if needed.
These were only added for ext4.
Bug:
150935323
Test: when creating a private f2fs volume, things work as expected.
Change-Id: I11ee04bfddecb6c95e223e66c9bf532c425e6fac
Automerger Merge Worker [Wed, 11 Mar 2020 13:09:22 +0000 (13:09 +0000)]
Merge "Only set quota project ID inheritance on app-private dirs." into rvc-dev am:
cbd458bb35
Change-Id: Ic4c437ba93728b0552a42505c13cefc7c9b3242f
TreeHugger Robot [Wed, 11 Mar 2020 12:54:58 +0000 (12:54 +0000)]
Merge "Only set quota project ID inheritance on app-private dirs." into rvc-dev
Automerger Merge Worker [Wed, 11 Mar 2020 12:01:04 +0000 (12:01 +0000)]
Merge "fskeyring & userspace reboot: support CE keys" into rvc-dev am:
58d89a355a
Change-Id: I79e495fe735c9c6380fa46de3b734e802c2a098a
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)
Nikita Ioffe [Wed, 11 Mar 2020 11:43:30 +0000 (11:43 +0000)]
Merge "fskeyring & userspace reboot: support CE keys" into rvc-dev
Martijn Coenen [Wed, 11 Mar 2020 10:51:45 +0000 (11:51 +0100)]
Only set quota project ID inheritance on app-private dirs.
Previously every directory on external storage had project ID quota
inheritance enabled; this means that if any new file/directory is
created under such a directory, it will inherit the project ID from the
parent. We use a default project ID of 1000 for generic directories, and
application-specific project IDs for app-specific directories.
MediaProvider is responsible for updating the quota type in the generic
directories, as it scans all files there. However, there is a problem
with this approach: if you move a file to a directory with project ID
inheritance set, and the project ID of that file differs from the
project ID of the dir, that results in an EXDEV error, and requires a
copy instead. For example, if /sdcard/DCIM/test.jpg has a project ID of
1003 (for images), and you try to move it to /sdcard/Pictures/test.jpg,
that would require a copy, because the project ID of /sdcard/Pictures is
1000.
While this is not a very common scenario, it's still better to avoid it.
Luckily we can - since MediaProvider anyway scans all files, it will set
the project ID on individual files correctly - there's no need to
inherit them.
We then only need to inherit quota in application-specific directories,
since in those directories the app can create files itself, and those
need to be tagged correctly.
This change enables that, by removing quota inheritance setting from the
top-level directory, and instead doing it for app-specific directories
instead.
Bug:
151078664
Test: atest StorageHostTest
atest com.android.tests.fused.host.FuseDaemonHostTest#testRenameAndReplaceFile
Change-Id: I38a057ec61cb627e39a3ff7ac58c7218dc251bdc
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
Automerger Merge Worker [Fri, 6 Mar 2020 00:28:29 +0000 (00:28 +0000)]
[automerger skipped] Use the blk_device supplied by vdc encryptFstab am:
7de5377c89 -s ours
am skip reason: Change-Id I279f087b1b7aded40c5a62281154851ce970ba70 with SHA-1
48aa90cd6b is in history
Change-Id: I9eb2f1872efa09a914d77404e4ae675cc106f59d
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
Merged-In: I279f087b1b7aded40c5a62281154851ce970ba70
Change-Id: I279f087b1b7aded40c5a62281154851ce970ba70
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:32:43 +0000 (16:32 +0000)]
Merge "Use the blk_device supplied by vdc encryptFstab" am:
3b3a13a81a am:
eeb005eb7d
Change-Id: I830e0e44c0d54d5b89e1dab0ab51192261746556
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 [Thu, 5 Mar 2020 00:37:18 +0000 (00:37 +0000)]
[automerger skipped] Merge "umount /data/user/0 before umount /data" into rvc-dev am:
16df3dc2b5 -s ours
am skip reason: Change-Id I919f9e31a9d2d745b297a7ab99b399aa9b293b39 with SHA-1
3cf3233bac is in history
Change-Id: I22164c5f84bf5ab19a8586d2000cbb98a28e33c0
Hung-ying Tyan [Thu, 5 Mar 2020 00:24:34 +0000 (00:24 +0000)]
Merge "umount /data/user/0 before umount /data" into rvc-dev
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:33:05 +0000 (15:33 +0000)]
[automerger skipped] Merge "fskeyring & userspace reboot: support DE keys" am:
3b719ed32e am:
ac589ee784 -s ours
am skip reason: Change-Id I153caa1d7c373b3c906a34f1184c681e52854a9d with SHA-1
1eaea5a6a2 is in history
Change-Id: Ic498847cfe85ac0e45b33d221f6fdb69321f673d
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"
Automerger Merge Worker [Wed, 4 Mar 2020 12:31:38 +0000 (12:31 +0000)]
Merge "fskeyring & userspace reboot: support DE keys" into rvc-dev am:
e8c7f09834
Change-Id: Id1089810030a33b92273afd29fd2d9eace9ba684
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)