Xin Li
6167310291
[automerger skipped] Merge "Merge Android R" am: 141c2027e2
-s ours am: 789d1d0866
-s ours am: a56f7d2608
-s ours am: 2866b9d5a8
-s ours
...
am skip reason: Change-Id I477d2dfba05718c829fdb2099248a8baba1125ab with SHA-1 8743ef4ea6
is in history
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1422563
Change-Id: I75d342cc233eb58a2a2ba0c1f47979c6df484d87
2020-09-11 03:59:05 +00:00
Xin Li
2866b9d5a8
[automerger skipped] Merge "Merge Android R" am: 141c2027e2
-s ours am: 789d1d0866
-s ours am: a56f7d2608
-s ours
...
am skip reason: Change-Id I477d2dfba05718c829fdb2099248a8baba1125ab with SHA-1 8743ef4ea6
is in history
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1422563
Change-Id: Ib0d73f9b471d4cb9834da5c25aaeae2a53ade075
2020-09-11 03:33:34 +00:00
Xin Li
a56f7d2608
[automerger skipped] Merge "Merge Android R" am: 141c2027e2
-s ours am: 789d1d0866
-s ours
...
am skip reason: Change-Id I477d2dfba05718c829fdb2099248a8baba1125ab with SHA-1 8743ef4ea6
is in history
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1422563
Change-Id: Ic319ade87dab6280b771d6f8d91d7bfde3a056fe
2020-09-11 02:02:43 +00:00
Xin Li
789d1d0866
[automerger skipped] Merge "Merge Android R" am: 141c2027e2
-s ours
...
am skip reason: Change-Id I477d2dfba05718c829fdb2099248a8baba1125ab with SHA-1 8743ef4ea6
is in history
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1422563
Change-Id: I78dff452b759e863b082f44b76fb5ae9a83cb704
2020-09-11 00:40:18 +00:00
Xin Li
141c2027e2
Merge "Merge Android R"
2020-09-10 17:22:31 +00:00
Xin Li
1ef819d16a
Merge Android R
...
Bug: 168057903
Merged-In: I477d2dfba05718c829fdb2099248a8baba1125ab
Change-Id: Ib60b99425dc79ca4c5b23772f32036f4e17ad11f
2020-09-09 20:21:28 -07:00
Treehugger Robot
524071499b
Merge "bench: Add inodeop_bench benchmark" am: e804806d79
am: 8743ef4ea6
am: 6bc12b0352
am: 062c48860a
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1421048
Change-Id: I64a106cc52e7115bd52bd19ea36f03a1a7b0c7cc
2020-09-09 14:38:08 +00:00
Treehugger Robot
062c48860a
Merge "bench: Add inodeop_bench benchmark" am: e804806d79
am: 8743ef4ea6
am: 6bc12b0352
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1421048
Change-Id: I4207b03f8683cc3e8f0e9419f2102332d9fd36d9
2020-09-09 14:17:24 +00:00
Treehugger Robot
6bc12b0352
Merge "bench: Add inodeop_bench benchmark" am: e804806d79
am: 8743ef4ea6
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1421048
Change-Id: I1071fd34394aefcc2fc2e5bfd29e97df6dc28072
2020-09-09 13:50:13 +00:00
Treehugger Robot
8743ef4ea6
Merge "bench: Add inodeop_bench benchmark" am: e804806d79
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1421048
Change-Id: I477d2dfba05718c829fdb2099248a8baba1125ab
2020-09-09 13:34:41 +00:00
Treehugger Robot
e804806d79
Merge "bench: Add inodeop_bench benchmark"
2020-09-09 13:03:12 +00:00
Stefano Duo
046c854ae9
bench: Add inodeop_bench benchmark
...
Add new benchmark capable of generating specific inode operations
workloads. Currently, it supports create, delete, move, hardlink and
symlink.
Test: Manual run on cuttlefish and physical device
Bug: 165903680
Signed-off-by: Stefano Duo <stefanoduo@google.com>
Change-Id: Ia47f259b7ccea5fe1665b272c3cbc9ec1bf2eb56
2020-09-08 16:21:14 +00:00
TreeHugger Robot
44a669176f
[automerger skipped] Merge "EncryptInPlace: ensure that backup superblocks get encrypted" into rvc-qpr-dev am: 9988536ecd
-s ours
...
am skip reason: Change-Id Ic090bf4e88193b289b04c5254ddf661ef40b037e with SHA-1 4ac43f0e16
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12361901
Change-Id: I93bc72ed5355529e8686c51af40f0bca53162e24
2020-09-03 20:32:07 +00:00
TreeHugger Robot
9988536ecd
Merge "EncryptInPlace: ensure that backup superblocks get encrypted" into rvc-qpr-dev
2020-09-03 20:10:55 +00:00
Xin Li
3a5a648fce
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 24ae202734
-s ours am: f13d17f2b8
-s ours am: eee0ccf31c
-s ours
...
am skip reason: Change-Id Id417587a550b0f4abf5a6a3e4b4535011b21f627 with SHA-1 dd8b695c61
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12470406
Change-Id: I7ab45c725b9db4fc65b0f3e7c53ddc03961f9f82
2020-09-01 22:10:01 +00:00
Xin Li
eee0ccf31c
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 24ae202734
-s ours am: f13d17f2b8
-s ours
...
am skip reason: Change-Id Id417587a550b0f4abf5a6a3e4b4535011b21f627 with SHA-1 dd8b695c61
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12470406
Change-Id: I81c76af55e45dde815acb9138570e6ca627597a3
2020-09-01 21:46:46 +00:00
Xin Li
f13d17f2b8
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 24ae202734
-s ours
...
am skip reason: Change-Id Id417587a550b0f4abf5a6a3e4b4535011b21f627 with SHA-1 dd8b695c61
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12470406
Change-Id: Id0bdc9b0190233ed0384b52a5844597b337833e1
2020-09-01 20:37:11 +00:00
Jeongik Cha
567be48f58
Add '-unstable' to solve ODR violation am: 44b2f954be
am: e9d72cde04
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12377824
Change-Id: I2601fe8549a31065619a5d6072248e429fcf318d
2020-08-28 02:02:20 +00:00
Jeongik Cha
e9d72cde04
Add '-unstable' to solve ODR violation am: 44b2f954be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12377824
Change-Id: I9f3d00625a59390efdb926cde389729a71be7fa7
2020-08-28 01:49:42 +00:00
Xin Li
24ae202734
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
...
Bug: 166295507
Merged-In: Id417587a550b0f4abf5a6a3e4b4535011b21f627
Change-Id: Ibb5e8cf5f36dad408cf047dd0498aba24249b695
2020-08-27 10:17:42 -07:00
Daniel Rosenberg
434cd7a201
Set media folder +F for adopted storage as well am: 083221f5cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12384351
Change-Id: Ic7f73074717788e13abe7ed29a3e69b8c1ba409a
2020-08-20 01:58:16 +00:00
Daniel Rosenberg
083221f5cf
Set media folder +F for adopted storage as well
...
We previously only set +F for /data/media, but adopted storage needs
this as well. Instead we add support for adding attrs to PrepareDir.
Bug: 163453310
Test: sm set-virtual-disk true
follow UI setup and confirm +F on /mnt/expand/*/media
Change-Id: I08f13b57a4de3538e88b38eb95b0ac115a5a5ce8
Merged-In: I08f13b57a4de3538e88b38eb95b0ac115a5a5ce8
2020-08-19 22:22:02 +00:00
Jeongik Cha
44b2f954be
Add '-unstable' to solve ODR violation
...
The interface which is imported by an unstable interface is 'unstable'
as well. Until now, the ODR violation checker in aidl has omitted an
interface imported, but it will be checked, accordingly, fix the current
problem
Bug: 146436251
Test: m nothing
Change-Id: Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424
2020-08-14 14:56:23 +00:00
Will Shiu
3aa4dc7f64
EncryptInPlace: ensure that backup superblocks get encrypted
...
Block groups with EXT4_BG_BLOCK_UNINIT still have backup superblocks
(and backup block group descriptors). Fix EncryptInPlace to encrypt
these backup superblocks rather than leave them unencrypted.
Previously leaving the backup superblocks unencrypted didn't cause any
problems, but due to system/core commit 72abd7b246f7 ("Try to recover
corrupted ext4 /data with backup superblock") it is causing problems.
Bug: 162479411
Bug: 161871210
Merged-In: Ic090bf4e88193b289b04c5254ddf661ef40b037e
Change-Id: Ic090bf4e88193b289b04c5254ddf661ef40b037e
2020-08-12 09:34:11 -07:00
Treehugger Robot
601fc397e4
Merge "Add maco@ to vold OWNERS." am: 157a08bb92
am: 3d1b6ac7c0
am: abd6f5a165
am: 64e605bfee
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1396467
Change-Id: Id5d4954cab6ef86ca406582031660f3b263354de
2020-08-11 11:45:26 +00:00
Treehugger Robot
64e605bfee
Merge "Add maco@ to vold OWNERS." am: 157a08bb92
am: 3d1b6ac7c0
am: abd6f5a165
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1396467
Change-Id: I857784ab0f24771c96ad0ecf48ddec659c650f9c
2020-08-11 11:28:19 +00:00
Treehugger Robot
abd6f5a165
Merge "Add maco@ to vold OWNERS." am: 157a08bb92
am: 3d1b6ac7c0
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1396467
Change-Id: I02184aa11a783fb3201812d2a8f64faca981cbc2
2020-08-11 11:13:35 +00:00
Treehugger Robot
3d1b6ac7c0
Merge "Add maco@ to vold OWNERS." am: 157a08bb92
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1396467
Change-Id: I0d0a8048465e190105f03dfe76fbf5c8393a4198
2020-08-11 10:56:15 +00:00
Treehugger Robot
157a08bb92
Merge "Add maco@ to vold OWNERS."
2020-08-11 10:34:17 +00:00
Martijn Coenen
494b67bfcb
Add maco@ to vold OWNERS.
...
Bug: N/A
Test: N/A
Change-Id: Ib00991eccbd33e719a64d55da932f7f2bfab7b71
2020-08-11 09:13:58 +02:00
Eric Biggers
6583be02e0
Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129
am: c6f47996d6
am: 124f3575be
am: 86eefdac89
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1395128
Change-Id: I1b72ac80a0c369039a7b6e405715baef1c3481b5
2020-08-10 23:43:48 +00:00
Eric Biggers
86eefdac89
Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129
am: c6f47996d6
am: 124f3575be
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1395128
Change-Id: I09a23c705c2fe0bc01c321f38c3eadb7bd1e44da
2020-08-10 23:25:45 +00:00
Eric Biggers
124f3575be
Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129
am: c6f47996d6
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1395128
Change-Id: I14257e5e427795e8871de5df94696e49766566a6
2020-08-10 23:10:18 +00:00
Eric Biggers
c6f47996d6
Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1395128
Change-Id: Iacb41f3dba6c2a57943f766b749d87efe6f4e4b3
2020-08-10 22:53:51 +00:00
Eric Biggers
ee1a70c129
Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level"
2020-08-10 22:35:21 +00:00
Eric Biggers
a1189052ff
Merge "EncryptInPlace: ensure that backup superblocks get encrypted" am: 213dbe30a1
am: 5acfc3e8d5
am: d1a7e750e2
am: 891b367b0a
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1385029
Change-Id: I5399da429b5177f129f0e907d50a5caed760aa31
2020-08-10 19:10:41 +00:00
Eric Biggers
891b367b0a
Merge "EncryptInPlace: ensure that backup superblocks get encrypted" am: 213dbe30a1
am: 5acfc3e8d5
am: d1a7e750e2
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1385029
Change-Id: Ib38c9b7459b1dcd4c8b00334bcf4375d81d590fe
2020-08-10 18:46:37 +00:00
Eric Biggers
72d07130ac
vold: use __ANDROID_API_Q__ instead of pre_gki_level
...
The name "pre_gki_level" is causing some confusion because not all
devices launching with Android R are subject to the GKI requirement.
(See b/161563110#comment11.) E.g., devices that use a 4.14-based kernel
are exempt from GKI. However, the encryption requirements still apply.
Just use __ANDROID_API_Q__ directly instead.
No change in behavior.
Change-Id: Id02ae1140845ac1ae7cf78be4e57fe34da028abf
2020-08-10 11:45:08 -07:00
Eric Biggers
d1a7e750e2
Merge "EncryptInPlace: ensure that backup superblocks get encrypted" am: 213dbe30a1
am: 5acfc3e8d5
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1385029
Change-Id: I28615b8a9a656804b8ebacff0876e2acb1a64c1f
2020-08-10 18:22:03 +00:00
Eric Biggers
5acfc3e8d5
Merge "EncryptInPlace: ensure that backup superblocks get encrypted" am: 213dbe30a1
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1385029
Change-Id: I29e6eab9571d4556883594049f4abc33d9ffa674
2020-08-10 18:04:57 +00:00
Eric Biggers
213dbe30a1
Merge "EncryptInPlace: ensure that backup superblocks get encrypted"
2020-08-10 17:52:39 +00:00
Will Shiu
4ac43f0e16
EncryptInPlace: ensure that backup superblocks get encrypted
...
Block groups with EXT4_BG_BLOCK_UNINIT still have backup superblocks
(and backup block group descriptors). Fix EncryptInPlace to encrypt
these backup superblocks rather than leave them unencrypted.
Previously leaving the backup superblocks unencrypted didn't cause any
problems, but due to system/core commit 72abd7b246f7 ("Try to recover
corrupted ext4 /data with backup superblock") it is causing problems.
Bug: 162479411
Bug: 161871210
Change-Id: Ic090bf4e88193b289b04c5254ddf661ef40b037e
2020-08-06 11:05:45 -07:00
Treehugger Robot
9dc6b3343e
Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b
am: bb92ff6591
am: dd8b695c61
am: e9317d2d74
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365586
Change-Id: I80fb7d3fc455966b64e0626f273ec0c60e279de1
2020-07-17 19:42:07 +00:00
Treehugger Robot
e9317d2d74
Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b
am: bb92ff6591
am: dd8b695c61
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365586
Change-Id: I876aaf6bba933c964a3573d8053cc60829b3a5fa
2020-07-17 19:20:28 +00:00
Treehugger Robot
dd8b695c61
Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b
am: bb92ff6591
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365586
Change-Id: Id417587a550b0f4abf5a6a3e4b4535011b21f627
2020-07-17 19:02:45 +00:00
Treehugger Robot
bb92ff6591
Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365586
Change-Id: Ibb6947f1fad7a31cf2a42c3604c76fcf45a7082a
2020-07-17 18:38:05 +00:00
Treehugger Robot
5de675c93b
Merge "vold: restore -D__ANDROID_DEBUGGABLE__"
2020-07-17 18:24:51 +00:00
Mark Salyzyn
865086debe
vold: restore -D__ANDROID_DEBUGGABLE__
...
Regression introduced by
commit 7ebcc2bcfd
("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
2020-07-17 08:20:00 -07:00
Eric Biggers
358dfc0622
Merge "KeyUtil: use static local variable in isFsKeyringSupported()" am: 256b23b1c5
am: 350b5ae900
am: d0b2751e8f
am: bbeec06aeb
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365220
Change-Id: Ie41bfaac1b1d3ea2aea9cb73c655194dc690b212
2020-07-17 02:18:01 +00:00
Eric Biggers
e0ffab6cb4
Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9
am: 83a3eecc03
am: 6b36554b38
am: cb640677a7
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365221
Change-Id: Ie7df8fc2c5582ad23db0663d33014f86555edc1c
2020-07-17 02:17:40 +00:00