Commit graph

3815 commits

Author SHA1 Message Date
TreeHugger Robot
6af6c4deba Merge "Prefer f2fs for virtual (private) storage volumes." into rvc-dev am: 60d7c823ee am: dd9a9a417a
Change-Id: Iad32a8c315f598f782e33b0059261e27faaad199
2020-03-31 13:55:07 +00:00
TreeHugger Robot
e52e4f2e1e Merge "Prefer f2fs for virtual (private) storage volumes." into rvc-dev am: 60d7c823ee
Change-Id: Id0dc7498977c658b397f1e24e6f5f11a8b141ed3
2020-03-31 11:12:23 +00:00
TreeHugger Robot
dd9a9a417a Merge "Prefer f2fs for virtual (private) storage volumes." into rvc-dev am: 60d7c823ee
Change-Id: Icf293e9f683a5a24c2c510c2201705c8c898fa88
2020-03-31 11:11:49 +00:00
TreeHugger Robot
60d7c823ee Merge "Prefer f2fs for virtual (private) storage volumes." into rvc-dev 2020-03-31 11:00:31 +00:00
David Anderson
056c6a8af4 [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
2020-03-30 18:27:29 +00:00
Songchun Fan
9761c72880 [vold] update with incfs_ndk.h am: 01c4e91c09 am: c0aaacbd28
Change-Id: I62a75cf45950f4bfbbb0534a52de642453977e28
2020-03-30 18:07:29 +00:00
David Anderson
8d6ada6fc8 [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
2020-03-30 09:12:14 +00:00
David Anderson
459685a077 [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
2020-03-30 09:12:02 +00:00
David Anderson
1c29e84b70 [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
2020-03-30 09:00:10 +00:00
David Anderson
87bf96a60e [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
2020-03-30 09:00:04 +00:00
Songchun Fan
48dd647aa7 [vold] update with incfs_ndk.h am: 01c4e91c09
Change-Id: I3c917640ee14bdafeb012ca1ff59cab6c399d8a9
2020-03-29 17:15:03 +00:00
Songchun Fan
c0aaacbd28 [vold] update with incfs_ndk.h am: 01c4e91c09
Change-Id: I70d5449b42f1126885582b701bc45d9a501514e8
2020-03-29 17:15:00 +00:00
Songchun Fan
01c4e91c09 [vold] update with incfs_ndk.h
BUG: 150470163
Test: atest PackageManagerShellCommandIncrementalTest
Change-Id: I5166c49cf48f353dab35e385571ada517cb751ac
2020-03-27 17:07:06 -07:00
David Anderson
5ba8aeaa80 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
2020-03-27 20:16:44 +00:00
Yurii Zubrytskyi
44ef993cf1 [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
2020-03-26 08:09:05 +00:00
Yurii Zubrytskyi
5bf8b040f5 [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
2020-03-26 08:09:04 +00:00
Yurii Zubrytskyi
58802279e2 Merge changes from topic "merge-incremental-vold" am: 10a372f1d2 am: 41c1c40afc
Change-Id: I542b7a48e7d94b78bf3fb01e44263e2b161df60f
2020-03-26 07:59:46 +00:00
Yurii Zubrytskyi
b52e063350 Expose new IncFS interface through Vold am: d05bcc8070 am: 636da65360
Change-Id: I349002a3eb80d962c86b24f89816c4ce76d5d65e
2020-03-26 07:59:44 +00:00
Yurii Zubrytskyi
100553416a [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
2020-03-26 07:55:47 +00:00
Yurii Zubrytskyi
7867b1299c [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
2020-03-26 07:55:45 +00:00
Yurii Zubrytskyi
41c1c40afc Merge changes from topic "merge-incremental-vold" am: 10a372f1d2
Change-Id: Id6fe791310761aa715fdf0e37760052a1534a4f0
2020-03-26 07:33:58 +00:00
Yurii Zubrytskyi
636da65360 Expose new IncFS interface through Vold am: d05bcc8070
Change-Id: Icbdb9f233850e70e8ca7c458fd30c4bea93a9923
2020-03-26 07:33:56 +00:00
Yurii Zubrytskyi
10a372f1d2 Merge changes from topic "merge-incremental-vold"
* changes:
  [vold] Add argument verification to IncFS methods
  Expose new IncFS interface through Vold
2020-03-26 07:23:11 +00:00
Yurii Zubrytskyi
26f3a764ea [vold] Add argument verification to IncFS methods am: 131365a3e5 am: ae78344623
Change-Id: Ied64735b708a77a8e37007495e4d880e3ca677eb
2020-03-26 04:36:54 +00:00
Yurii Zubrytskyi
1b6379f521 [vold] Add argument verification to IncFS methods am: 131365a3e5 am: 8a24abaabe
Change-Id: I11d2947b5968defd1f364b3c4e6bf80459c24352
2020-03-26 04:36:43 +00:00
Yurii Zubrytskyi
ae78344623 [vold] Add argument verification to IncFS methods am: 131365a3e5
Change-Id: I8a19bea4ca9c8f30f754cf7d43feba432152e204
2020-03-26 04:25:24 +00:00
Yurii Zubrytskyi
8a24abaabe [vold] Add argument verification to IncFS methods am: 131365a3e5
Change-Id: I149dfdef094804c5eeaa928ee841f7fd7a5f228f
2020-03-26 04:25:16 +00:00
Yurii Zubrytskyi
9e7482ece1 [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
2020-03-25 17:21:49 -07:00
Yurii Zubrytskyi
131365a3e5 [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
2020-03-25 14:33:24 -07:00
Yurii Zubrytskyi
d05bcc8070 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
2020-03-24 14:26:27 -07:00
Paul Crowley
94abae03a9 Record use of metadata encryption in property
Bug: 152150018
Test: Cuttlefish with and without keydirectory option
Change-Id: I400873ec207cb63f0407fefc83962bb3a927e294
2020-03-24 09:12:48 -07:00
Martijn Coenen
7b76468eba Merge "Bind mount Android/data and Android/obb individually." into rvc-dev am: 81872e826c am: 7b64ad549a
Change-Id: I1076e65a7f4acbb778fa4f65ea9d4ae4f10fbf7d
2020-03-24 09:06:13 +00:00
Martijn Coenen
3ae5b72f36 Merge "Bind mount Android/data and Android/obb individually." into rvc-dev am: 81872e826c am: 1201947a81
Change-Id: I4d00f3be43c2b91058d3398683db136a307de73b
2020-03-24 09:05:58 +00:00
Martijn Coenen
7b64ad549a Merge "Bind mount Android/data and Android/obb individually." into rvc-dev am: 81872e826c
Change-Id: I1a454da8ca2f14c2e77f29d0b9e0f6e2a48528e1
2020-03-24 08:51:18 +00:00
Martijn Coenen
1201947a81 Merge "Bind mount Android/data and Android/obb individually." into rvc-dev am: 81872e826c
Change-Id: I59741944c7731abe21c4b680f496d80beb911a38
2020-03-24 08:50:52 +00:00
Martijn Coenen
81872e826c Merge "Bind mount Android/data and Android/obb individually." into rvc-dev 2020-03-24 08:31:44 +00:00
TreeHugger Robot
5cbaa2031a Merge "Add quota / casefold options to f2fs if needed." into rvc-dev am: fe6253e3a2 am: aab174907a
Change-Id: Ib920028df4d0e5c37422d12b2738e726a469d858
2020-03-20 15:01:34 +00:00
TreeHugger Robot
3f57deb011 Merge "Add quota / casefold options to f2fs if needed." into rvc-dev am: fe6253e3a2 am: 88788e9985
Change-Id: I4c5490971676431b37c9e4986957dac9620681ad
2020-03-20 15:01:05 +00:00
TreeHugger Robot
aab174907a Merge "Add quota / casefold options to f2fs if needed." into rvc-dev am: fe6253e3a2
Change-Id: Ia97181187e3eff582d2edf887b21811aa88ea7d2
2020-03-20 14:48:23 +00:00
TreeHugger Robot
88788e9985 Merge "Add quota / casefold options to f2fs if needed." into rvc-dev am: fe6253e3a2
Change-Id: I7debdd40fc1193146816cb1c54f5a608d5f4af32
2020-03-20 14:48:05 +00:00
TreeHugger Robot
fe6253e3a2 Merge "Add quota / casefold options to f2fs if needed." into rvc-dev 2020-03-20 14:35:07 +00:00
Martijn Coenen
449a7d8ae0 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
2020-03-20 13:24:41 +01:00
Xin Li
973d936bc7 [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
2020-03-19 04:38:28 +00:00
Xin Li
8db17c3111 DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 4e13a60b8d
Change-Id: Ic6e88b868f1e8de04713198d892411caab957906
2020-03-19 04:22:43 +00:00
Xin Li
f54a1177ad [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
2020-03-19 04:19:36 +00:00
Xin Li
4e13a60b8d DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master
Bug: 151763422
Change-Id: I3f26efbcf61365bfac87aa83a0bc8a5dbb2d0a65
2020-03-18 19:40:59 -07:00
Automerger Merge Worker
ddf387ca8e Merge "Fix vold wedge when unmounting Android/ am: b6488f3f04 am: 90c928a725" into rvc-d1-dev-plus-aosp 2020-03-18 10:08:59 +00:00
Zim
83819b0915 Fix vold wedge when unmounting Android/ am: b6488f3f04 am: 90c928a725
Change-Id: If22a2c0517ac33715b7473f3d2529ba28ee25211
2020-03-18 10:08:52 +00:00
Zim
6114fa931e Fix vold wedge when unmounting Android/ am: b6488f3f04 am: 3b6d40f941
Change-Id: Ibb8b64997b046e891449ee829b3c6e91a97763b6
2020-03-18 10:08:46 +00:00
Zim
3b6d40f941 Fix vold wedge when unmounting Android/ am: b6488f3f04
Change-Id: Iad3d05b416a9ace3986c3d9db35322fd2c8a099d
2020-03-18 09:55:44 +00:00