OSDN Git Service
Linus Tufvesson [Fri, 3 Apr 2020 13:56:15 +0000 (13:56 +0000)]
Replace EnsureDirExists with a call to setupAppDir am:
75973cb0dd am:
c00e508709
Change-Id: Id7cfffae9142d4624d764ddc286ec6633bc208d6
Linus Tufvesson [Fri, 3 Apr 2020 13:28:11 +0000 (13:28 +0000)]
Replace EnsureDirExists with a call to setupAppDir am:
75973cb0dd
Change-Id: I58cb29e233e98b588a2e66797bd260b548059ca2
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
Automerger Merge Worker [Thu, 2 Apr 2020 01:05:38 +0000 (01:05 +0000)]
Merge "Merge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev am:
6ce90ced12 am:
19e3a19d75" into rvc-d1-dev-plus-aosp
Alex Buynytskyy [Thu, 2 Apr 2020 01:05:30 +0000 (01:05 +0000)]
Merge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev am:
6ce90ced12 am:
31e2a7c5c5
Change-Id: I8d7fababb1b1824a516d7bcb82b6d7712d6367d0
Alex Buynytskyy [Thu, 2 Apr 2020 01:05:19 +0000 (01:05 +0000)]
Merge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev am:
6ce90ced12 am:
19e3a19d75
Change-Id: I60511ff9d50f0ea79d503e455b41075ae45e6718
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:48:13 +0000 (00:48 +0000)]
Merge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev am:
6ce90ced12
Change-Id: Ib92de641097b748c417e0d4dfdc21213da7fd789
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
TreeHugger Robot [Wed, 1 Apr 2020 23:07:39 +0000 (23:07 +0000)]
Merge "Send earlyBootEnded notice to all Keymasters" into rvc-dev am:
be39b1d53e am:
1735b4620d
Change-Id: Idf5044bc39dd897ff08fa2ea8fad34da10db63ca
TreeHugger Robot [Wed, 1 Apr 2020 23:07:18 +0000 (23:07 +0000)]
Merge "Send earlyBootEnded notice to all Keymasters" into rvc-dev am:
be39b1d53e am:
ab75cad3ba
Change-Id: Ib4e8eef5a87ed2386573e79dde91360eeebb9f21
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:42:32 +0000 (22:42 +0000)]
Merge "Send earlyBootEnded notice to all Keymasters" into rvc-dev am:
be39b1d53e
Change-Id: Ie48c8f230f88cab75c72594269adb1aed7529f3b
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 17:50:21 +0000 (17:50 +0000)]
Merge "Prefer f2fs for virtual (private) storage volumes." into rvc-dev am:
60d7c823ee am:
e52e4f2e1e
Change-Id: Ib4b3b1be427b7fac0fa0754d2d2c51162e7754ab
David Anderson [Tue, 31 Mar 2020 17:30:09 +0000 (17:30 +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:
8d6ada6fc8 -s ours
am skip reason: Change-Id Id8616804bba622226ca21b8eff0d3eb577b4b7e0 with SHA-1
5ba8aeaa80 is in history
Change-Id: I949eec911b63c5934e9d62df9159d2b937497959
Songchun Fan [Tue, 31 Mar 2020 14:25:13 +0000 (14:25 +0000)]
[vold] update with incfs_ndk.h am:
01c4e91c09 am:
48dd647aa7
Change-Id: I9c7f4c8e8a7a2238c49555e31eee8b7cb00b2b7d
TreeHugger Robot [Tue, 31 Mar 2020 13:55:07 +0000 (13:55 +0000)]
Merge "Prefer f2fs for virtual (private) storage volumes." into rvc-dev am:
60d7c823ee am:
dd9a9a417a
Change-Id: Iad32a8c315f598f782e33b0059261e27faaad199
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:11:49 +0000 (11:11 +0000)]
Merge "Prefer f2fs for virtual (private) storage volumes." into rvc-dev am:
60d7c823ee
Change-Id: Icf293e9f683a5a24c2c510c2201705c8c898fa88
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 18:27:29 +0000 (18:27 +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:
459685a077 -s ours
am skip reason: Change-Id Id8616804bba622226ca21b8eff0d3eb577b4b7e0 with SHA-1
1dd5c4f787 is in history
Change-Id: Id7682b7fc97ee5871bd5c1d806747ee3f868209c
Songchun Fan [Mon, 30 Mar 2020 18:07:29 +0000 (18:07 +0000)]
[vold] update with incfs_ndk.h am:
01c4e91c09 am:
c0aaacbd28
Change-Id: I62a75cf45950f4bfbbb0534a52de642453977e28
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:12:02 +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: If9bb43422e10f5c5053f00191b1f1dcec1718aea
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 [Sun, 29 Mar 2020 17:15:00 +0000 (17:15 +0000)]
[vold] update with incfs_ndk.h am:
01c4e91c09
Change-Id: I70d5449b42f1126885582b701bc45d9a501514e8
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 08:09:05 +0000 (08:09 +0000)]
[automerger skipped] Merge changes from topic "merge-incremental-vold" am:
10a372f1d2 am:
41c1c40afc -s ours am:
100553416a -s ours
am skip reason: Change-Id I03a8cab0dd6abd7d5c9dcbbc2acb651e818e6cd8 with SHA-1
131365a3e5 is in history
Change-Id: I2a6b7b5398163aaa6c262d1a6117c605e0c49a91
Yurii Zubrytskyi [Thu, 26 Mar 2020 08:09:04 +0000 (08:09 +0000)]
[automerger skipped] Expose new IncFS interface through Vold am:
d05bcc8070 am:
636da65360 -s ours am:
7867b1299c -s ours
am skip reason: Change-Id I09b33a34ff1ac7f6e415b7bd090c22e7df24d72d with SHA-1
3497cb5be5 is in history
Change-Id: Idc9f9d8236d3a19826ac4eec845d83df1f33a18e
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:36:54 +0000 (04:36 +0000)]
[vold] Add argument verification to IncFS methods am:
131365a3e5 am:
ae78344623
Change-Id: Ied64735b708a77a8e37007495e4d880e3ca677eb
Yurii Zubrytskyi [Thu, 26 Mar 2020 04:36:43 +0000 (04:36 +0000)]
[vold] Add argument verification to IncFS methods am:
131365a3e5 am:
8a24abaabe
Change-Id: I11d2947b5968defd1f364b3c4e6bf80459c24352
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 [Thu, 26 Mar 2020 04:25:16 +0000 (04:25 +0000)]
[vold] Add argument verification to IncFS methods am:
131365a3e5
Change-Id: I149dfdef094804c5eeaa928ee841f7fd7a5f228f
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 09:06:13 +0000 (09:06 +0000)]
Merge "Bind mount Android/data and Android/obb individually." into rvc-dev am:
81872e826c am:
7b64ad549a
Change-Id: I1076e65a7f4acbb778fa4f65ea9d4ae4f10fbf7d
Martijn Coenen [Tue, 24 Mar 2020 09:05:58 +0000 (09:05 +0000)]
Merge "Bind mount Android/data and Android/obb individually." into rvc-dev am:
81872e826c am:
1201947a81
Change-Id: I4d00f3be43c2b91058d3398683db136a307de73b
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:50:52 +0000 (08:50 +0000)]
Merge "Bind mount Android/data and Android/obb individually." into rvc-dev am:
81872e826c
Change-Id: I59741944c7731abe21c4b680f496d80beb911a38
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 15:01:34 +0000 (15:01 +0000)]
Merge "Add quota / casefold options to f2fs if needed." into rvc-dev am:
fe6253e3a2 am:
aab174907a
Change-Id: Ib920028df4d0e5c37422d12b2738e726a469d858
TreeHugger Robot [Fri, 20 Mar 2020 15:01:05 +0000 (15:01 +0000)]
Merge "Add quota / casefold options to f2fs if needed." into rvc-dev am:
fe6253e3a2 am:
88788e9985
Change-Id: I4c5490971676431b37c9e4986957dac9620681ad
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:48:05 +0000 (14:48 +0000)]
Merge "Add quota / casefold options to f2fs if needed." into rvc-dev am:
fe6253e3a2
Change-Id: I7debdd40fc1193146816cb1c54f5a608d5f4af32
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:38:28 +0000 (04:38 +0000)]
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@
6304901 into stag-aosp-master am:
4e13a60b8d -s ours am:
f54a1177ad
Change-Id: Ie0f3b95d8041a272ecaab2c5d4a0fa2be23eaf74
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
Automerger Merge Worker [Wed, 18 Mar 2020 10:08:59 +0000 (10:08 +0000)]
Merge "Fix vold wedge when unmounting Android/ am:
b6488f3f04 am:
90c928a725" into rvc-d1-dev-plus-aosp
Zim [Wed, 18 Mar 2020 10:08:52 +0000 (10:08 +0000)]
Fix vold wedge when unmounting Android/ am:
b6488f3f04 am:
90c928a725
Change-Id: If22a2c0517ac33715b7473f3d2529ba28ee25211
Zim [Wed, 18 Mar 2020 10:08:46 +0000 (10:08 +0000)]
Fix vold wedge when unmounting Android/ am:
b6488f3f04 am:
3b6d40f941
Change-Id: Ibb8b64997b046e891449ee829b3c6e91a97763b6
Zim [Wed, 18 Mar 2020 09:55:44 +0000 (09:55 +0000)]
Fix vold wedge when unmounting Android/ am:
b6488f3f04
Change-Id: Iad3d05b416a9ace3986c3d9db35322fd2c8a099d
Zim [Wed, 18 Mar 2020 09:55:29 +0000 (09:55 +0000)]
Fix vold wedge when unmounting Android/ am:
b6488f3f04
Change-Id: Idc5260aca207ee933720a7762cf4be9ea1b18686
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 16:11:17 +0000 (16:11 +0000)]
Make storage dirs remount fork() safe am:
6b12257702 am:
fdacc8d462
Change-Id: Icededd32e7b2495b8fa504e2f483a17f5ab6e9aa
Automerger Merge Worker [Mon, 16 Mar 2020 16:09:24 +0000 (16:09 +0000)]
Make storage dirs remount fork() safe am:
6b12257702 am:
d0d09131fd
Change-Id: Ic05b8d872d905449942159f50750a70a6f087100
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
Automerger Merge Worker [Mon, 16 Mar 2020 15:55:40 +0000 (15:55 +0000)]
Make storage dirs remount fork() safe am:
6b12257702
Change-Id: I99fd33c2969236efc8f245aafb55ba4a0d5e9691
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:48:29 +0000 (20:48 +0000)]
[automerger skipped] Merge "fskeyring & userspace reboot: support CE keys" am:
eaa3443ad8 am:
91ba0c8fa4 -s ours am:
03d5991abc -s ours
am skip reason: Change-Id I37603dc136c7ededc7b0381e4d730cb0ffd912b4 with SHA-1
1ee35cf002 is in history
Change-Id: Ife7e46b7e007b2f5cf16d50c4234af203bd1fe30
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:29:36 +0000 (13:29 +0000)]
Merge "Only set quota project ID inheritance on app-private dirs." into rvc-dev am:
cbd458bb35 am:
369c24a751
Change-Id: I2cc95d5202cab93d8598394408c49a9ae96739fa
Automerger Merge Worker [Wed, 11 Mar 2020 13:29:25 +0000 (13:29 +0000)]
Merge "Only set quota project ID inheritance on app-private dirs." into rvc-dev am:
cbd458bb35 am:
a393ab1b10
Change-Id: If31fc84973e0b11adb7c10b61efaa7075396d50a
Automerger Merge Worker [Wed, 11 Mar 2020 13:09:25 +0000 (13:09 +0000)]
Merge "Only set quota project ID inheritance on app-private dirs." into rvc-dev am:
cbd458bb35
Change-Id: Id8975b6e44e613285467eac8c4156f94fe76fb0d
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:14:52 +0000 (12:14 +0000)]
Merge "fskeyring & userspace reboot: support CE keys" into rvc-dev am:
58d89a355a am:
45c30df34f
Change-Id: Ia08e413d661f0c504fe00e6a877c870e8171713e
Automerger Merge Worker [Wed, 11 Mar 2020 12:14:44 +0000 (12:14 +0000)]
Merge "fskeyring & userspace reboot: support CE keys" into rvc-dev am:
58d89a355a am:
8968fc0219
Change-Id: Iac74619685702bd93dcab27b8b371bf8a21dab6f
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
Automerger Merge Worker [Wed, 11 Mar 2020 12:00:54 +0000 (12:00 +0000)]
Merge "fskeyring & userspace reboot: support CE keys" into rvc-dev am:
58d89a355a
Change-Id: Id2460f313eac688973af9a20b4fc4fddd5cd609a
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 02:01:50 +0000 (02:01 +0000)]
[automerger skipped] Use the blk_device supplied by vdc encryptFstab am:
7de5377c89 am:
76c4dfa743 -s ours
am skip reason: Change-Id I279f087b1b7aded40c5a62281154851ce970ba70 with SHA-1
7de5377c89 is in history
Change-Id: Ib045f4ddfd3adfff3f227cb56388ccb8ef564fd8
Automerger Merge Worker [Fri, 6 Mar 2020 01:36:39 +0000 (01:36 +0000)]
Use the blk_device supplied by vdc encryptFstab am:
7de5377c89
Change-Id: I7d25460f5f4333ce9278349dadaa58b09f197c02
Automerger Merge Worker [Fri, 6 Mar 2020 00:48:35 +0000 (00:48 +0000)]
[automerger skipped] Use the blk_device supplied by vdc encryptFstab am:
7de5377c89 -s ours am:
8988772f16 -s ours
am skip reason: Change-Id I279f087b1b7aded40c5a62281154851ce970ba70 with SHA-1
48aa90cd6b is in history
Change-Id: Iefce2c088b2407f55a06cf81140d2dc9fdbaddb2
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:42:54 +0000 (16:42 +0000)]
Merge "Use the blk_device supplied by vdc encryptFstab" am:
3b3a13a81a am:
eeb005eb7d am:
32f9bd4e8b
Change-Id: Id92f71bac3fb83745f32c192009ed899c244eda7
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