git.osdn.net Git - android-x86/system-vold.git/log

OSDN Git Service

(root) / android-x86 / system-vold.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Xin Li [Wed, 2 Sep 2020 01:59:27 +0000 (01:59 +0000)]

[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: 3a5a648fce -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: I6c405ebb197ae5cf53deefeb8784fe0d6e609a27

commit | commitdiff | tree

Xin Li [Tue, 1 Sep 2020 22:10:01 +0000 (22:10 +0000)]

[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

commit | commitdiff | tree

Xin Li [Tue, 1 Sep 2020 21:46:46 +0000 (21:46 +0000)]

[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

commit | commitdiff | tree

Xin Li [Tue, 1 Sep 2020 20:37:11 +0000 (20:37 +0000)]

[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

commit | commitdiff | tree

Jeongik Cha [Fri, 28 Aug 2020 02:57:14 +0000 (02:57 +0000)]

Add '-unstable' to solve ODR violation am: 44b2f954be am: e9d72cde04 am: 567be48f58

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12377824

Change-Id: I5d232037483c08c9243745ee12cfb3ef9a5100bc

commit | commitdiff | tree

Jeongik Cha [Fri, 28 Aug 2020 02:02:20 +0000 (02:02 +0000)]

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

commit | commitdiff | tree

Jeongik Cha [Fri, 28 Aug 2020 01:49:42 +0000 (01:49 +0000)]

Add '-unstable' to solve ODR violation am: 44b2f954be

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12377824

Change-Id: I9f3d00625a59390efdb926cde389729a71be7fa7

commit | commitdiff | tree

Xin Li [Thu, 27 Aug 2020 17:17:42 +0000 (10:17 -0700)]

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

Bug: 166295507
Merged-In: Id417587a550b0f4abf5a6a3e4b4535011b21f627
Change-Id: Ibb5e8cf5f36dad408cf047dd0498aba24249b695

commit | commitdiff | tree

Daniel Rosenberg [Thu, 20 Aug 2020 02:13:32 +0000 (02:13 +0000)]

[automerger skipped] Set media folder +F for adopted storage as well am: 083221f5cf am: 434cd7a201 -s ours

am skip reason: Change-Id I08f13b57a4de3538e88b38eb95b0ac115a5a5ce8 with SHA-1 3bb866429b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12384351

Change-Id: Ib1368443c16ea30039fdd1aacc5319aec49d2b73

commit | commitdiff | tree

Daniel Rosenberg [Thu, 20 Aug 2020 01:58:16 +0000 (01:58 +0000)]

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

commit | commitdiff | tree

Daniel Rosenberg [Thu, 13 Aug 2020 01:31:43 +0000 (18:31 -0700)]

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

commit | commitdiff | tree

Daniel Rosenberg [Thu, 13 Aug 2020 01:31:43 +0000 (18:31 -0700)]

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

commit | commitdiff | tree

Jeongik Cha [Fri, 14 Aug 2020 14:51:36 +0000 (23:51 +0900)]

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

commit | commitdiff | tree

Treehugger Robot [Tue, 11 Aug 2020 12:07:59 +0000 (12:07 +0000)]

Merge "Add maco@ to vold OWNERS." am: 157a08bb92 am: 3d1b6ac7c0 am: abd6f5a165 am: 64e605bfee am: 601fc397e4

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1396467

Change-Id: I95212545a428d375d8f1b4ac431d04a8ffdc361a

commit | commitdiff | tree

Treehugger Robot [Tue, 11 Aug 2020 11:45:26 +0000 (11:45 +0000)]

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

commit | commitdiff | tree

Treehugger Robot [Tue, 11 Aug 2020 11:28:19 +0000 (11:28 +0000)]

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

commit | commitdiff | tree

Treehugger Robot [Tue, 11 Aug 2020 11:13:35 +0000 (11:13 +0000)]

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

commit | commitdiff | tree

Treehugger Robot [Tue, 11 Aug 2020 10:56:15 +0000 (10:56 +0000)]

Merge "Add maco@ to vold OWNERS." am: 157a08bb92

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1396467

Change-Id: I0d0a8048465e190105f03dfe76fbf5c8393a4198

commit | commitdiff | tree

Treehugger Robot [Tue, 11 Aug 2020 10:34:17 +0000 (10:34 +0000)]

Merge "Add maco@ to vold OWNERS."

commit | commitdiff | tree

Martijn Coenen [Tue, 11 Aug 2020 07:13:27 +0000 (09:13 +0200)]

Add maco@ to vold OWNERS.

Bug: N/A
Test: N/A
Change-Id: Ib00991eccbd33e719a64d55da932f7f2bfab7b71

commit | commitdiff | tree

Eric Biggers [Tue, 11 Aug 2020 00:01:26 +0000 (00:01 +0000)]

Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129 am: c6f47996d6 am: 124f3575be am: 86eefdac89 am: 6583be02e0

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1395128

Change-Id: I45d5a03e7c4a7580e299d4d95e625220f3eb239b

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 23:43:48 +0000 (23:43 +0000)]

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

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 23:25:45 +0000 (23:25 +0000)]

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

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 23:10:18 +0000 (23:10 +0000)]

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

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 22:53:51 +0000 (22:53 +0000)]

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

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 22:35:21 +0000 (22:35 +0000)]

Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level"

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 19:33:36 +0000 (19:33 +0000)]

Merge "EncryptInPlace: ensure that backup superblocks get encrypted" am: 213dbe30a1 am: 5acfc3e8d5 am: d1a7e750e2 am: 891b367b0a am: a1189052ff

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1385029

Change-Id: I810595f3d7152b8f00be9a8bb669d6bb6d477499

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 19:10:41 +0000 (19:10 +0000)]

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

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 18:46:37 +0000 (18:46 +0000)]

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

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 17:55:56 +0000 (10:55 -0700)]

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

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 18:22:03 +0000 (18:22 +0000)]

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

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 18:04:57 +0000 (18:04 +0000)]

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

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 17:52:39 +0000 (17:52 +0000)]

Merge "EncryptInPlace: ensure that backup superblocks get encrypted"

commit | commitdiff | tree

Will Shiu [Wed, 29 Jul 2020 09:03:17 +0000 (17:03 +0800)]

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

commit | commitdiff | tree

Treehugger Robot [Fri, 17 Jul 2020 20:03:34 +0000 (20:03 +0000)]

Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b am: bb92ff6591 am: dd8b695c61 am: e9317d2d74 am: 9dc6b3343e

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365586

Change-Id: I5baaf7242bf3358862bf2c406af9aa6b9e49558b

commit | commitdiff | tree

Treehugger Robot [Fri, 17 Jul 2020 19:42:07 +0000 (19:42 +0000)]

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

commit | commitdiff | tree

Treehugger Robot [Fri, 17 Jul 2020 19:20:28 +0000 (19:20 +0000)]

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

commit | commitdiff | tree

Treehugger Robot [Fri, 17 Jul 2020 19:02:45 +0000 (19:02 +0000)]

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Fri, 17 Jul 2020 18:24:51 +0000 (18:24 +0000)]

Merge "vold: restore -D__ANDROID_DEBUGGABLE__"

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 02:28:58 +0000 (02:28 +0000)]

Merge "KeyUtil: use static local variable in isFsKeyringSupported()" am: 256b23b1c5 am: 350b5ae900 am: d0b2751e8f am: bbeec06aeb am: 358dfc0622

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365220

Change-Id: I8c6578679e1fc10f658b3ac8d9bfed95935e3467

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 02:28:48 +0000 (02:28 +0000)]

Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9 am: 83a3eecc03 am: 6b36554b38 am: cb640677a7 am: e0ffab6cb4

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365221

Change-Id: Id21d662bf023c7ccc6b6117691d454f9f5dbf5a6

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 02:18:01 +0000 (02:18 +0000)]

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

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 02:17:40 +0000 (02:17 +0000)]

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

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 02:03:01 +0000 (02:03 +0000)]

Merge "KeyUtil: use static local variable in isFsKeyringSupported()" am: 256b23b1c5 am: 350b5ae900 am: d0b2751e8f

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365220

Change-Id: Id61233aba34e8c67a2ab3860c4259eaeaefdab15

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 02:02:39 +0000 (02:02 +0000)]

Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9 am: 83a3eecc03 am: 6b36554b38

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365221

Change-Id: I18cbddc92985f88d95dca71b05b9d07919134af9

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 01:50:24 +0000 (01:50 +0000)]

Merge "KeyUtil: use static local variable in isFsKeyringSupported()" am: 256b23b1c5 am: 350b5ae900

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365220

Change-Id: Ia7fca6e61c58317002271c8338bb01a12e8223a5

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 01:50:07 +0000 (01:50 +0000)]

Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9 am: 83a3eecc03

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365221

Change-Id: Iffa50e4c549469de6425134369e609856f1d7813

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 01:20:43 +0000 (01:20 +0000)]

Merge "KeyUtil: use static local variable in isFsKeyringSupported()"

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 01:19:39 +0000 (01:19 +0000)]

Merge "vold: drop local fscrypt UAPI definitions"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Biggers [Thu, 16 Jul 2020 21:54:18 +0000 (21:54 +0000)]

Merge "vold: remove checkEncryption" am: 2d9777bfbf am: 15c0d3e5d0 am: 4cd238b900 am: c36d0e23bb am: 02c65ccdc6

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1363339

Change-Id: Ifd363d28586b1d91092c2eb0f93b1e57ec965d79

commit | commitdiff | tree

Eric Biggers [Thu, 16 Jul 2020 21:31:56 +0000 (21:31 +0000)]

Merge "vold: remove checkEncryption" am: 2d9777bfbf am: 15c0d3e5d0 am: 4cd238b900 am: c36d0e23bb

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1363339

Change-Id: I20509d10a0534c9c2a6795c73809f02461e03b67

commit | commitdiff | tree

Eric Biggers [Thu, 16 Jul 2020 21:16:12 +0000 (21:16 +0000)]

Merge "vold: remove checkEncryption" am: 2d9777bfbf am: 15c0d3e5d0 am: 4cd238b900

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1363339

Change-Id: I862a51b219b0151c24d009921fa6cd509afa18b0

commit | commitdiff | tree

Eric Biggers [Thu, 16 Jul 2020 21:00:33 +0000 (21:00 +0000)]

Merge "vold: remove checkEncryption" am: 2d9777bfbf am: 15c0d3e5d0

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1363339

Change-Id: I23b9a01632b61a92896ae83e2152fa047dd85c48

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Biggers [Thu, 16 Jul 2020 20:30:35 +0000 (20:30 +0000)]

Merge "vold: remove checkEncryption"

commit | commitdiff | tree

Treehugger Robot [Thu, 16 Jul 2020 12:38:04 +0000 (12:38 +0000)]

Merge "Revert "[Vold] Conditional dependency to ARC++ ObbVolume"" am: 6e6fc6b8d3 am: 11757842a3 am: 9afa4c65d8 am: d4b94d95ab am: a6c4780d7d

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1320919

Change-Id: I5d0be23aa9d3e9e3a674a4c368909b61c843b6dd

commit | commitdiff | tree

Treehugger Robot [Thu, 16 Jul 2020 12:27:09 +0000 (12:27 +0000)]

Merge "Revert "[Vold] Conditional dependency to ARC++ ObbVolume"" am: 6e6fc6b8d3 am: 11757842a3 am: 9afa4c65d8 am: d4b94d95ab

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1320919

Change-Id: I11db3a962dbe88092f37604d91f844db31275efa

commit | commitdiff | tree

Treehugger Robot [Thu, 16 Jul 2020 12:16:19 +0000 (12:16 +0000)]

Merge "Revert "[Vold] Conditional dependency to ARC++ ObbVolume"" am: 6e6fc6b8d3 am: 11757842a3 am: 9afa4c65d8

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1320919

Change-Id: Idf5736b15c3d1cd2d2dc994e7c5298605d45412a

commit | commitdiff | tree

Treehugger Robot [Thu, 16 Jul 2020 12:03:40 +0000 (12:03 +0000)]

Merge "Revert "[Vold] Conditional dependency to ARC++ ObbVolume"" am: 6e6fc6b8d3 am: 11757842a3

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1320919

Change-Id: Iec0c1190443f1366a0f105bb3eba3967635ff544

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 16 Jul 2020 11:04:04 +0000 (11:04 +0000)]

Merge "Revert "[Vold] Conditional dependency to ARC++ ObbVolume""

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 8 Jul 2020 17:47:36 +0000 (17:47 +0000)]

Merge "Revert "Change mounting storage data and obb to on by default""

commit | commitdiff | tree

Adam Wright [Wed, 8 Jul 2020 09:21:25 +0000 (09:21 +0000)]

Revert "Change mounting storage data and obb to on by default"

Revert submission 10829484-test_flag_change

Reason for revert: Trialing a revert for b/160307959, b/160604224 based on bisection research. This won't land without discussion.
Reverted Changes:
Ifbf604716:Change mounting storage data and obb to on by defa...
I2e500209b:Change mounting storage data and obb to on by defa...

Change-Id: I3ff98f225243a759549cbf03d113d662e36e3fbe

commit | commitdiff | tree

Automerger Merge Worker [Wed, 8 Jul 2020 01:19:06 +0000 (01:19 +0000)]

Merge "[automerger skipped] vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a -s ours am: 09b9cae24d -s ours" into rvc-d1-dev-plus-aosp am: ee0e304091 -s ours am: b6967c15df -s ours

am skip reason: Change-Id Ie27b80658db53b1a4207b3cbb4e309d05130812e with SHA-1 006eed8e3a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12098822

Change-Id: Ie282fb86ebffba86d497d9387e0ae5cfe09481a6

commit | commitdiff | tree

Eric Biggers [Wed, 8 Jul 2020 01:18:52 +0000 (01:18 +0000)]

[automerger skipped] vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a am: 65aa48c810 -s ours am: 784638461d -s ours am: 4313aa7057 -s ours

am skip reason: Change-Id Ie27b80658db53b1a4207b3cbb4e309d05130812e with SHA-1 006eed8e3a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12098822

Change-Id: Ib7c38bd9f66d44224cf6c7d2808bb23460f1b859

commit | commitdiff | tree

Eric Biggers [Wed, 8 Jul 2020 01:18:15 +0000 (01:18 +0000)]

[automerger skipped] vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a am: 65aa48c810 am: 1f6e9af5b1 -s ours am: 3e34ce2c43 -s ours

am skip reason: Change-Id Ie27b80658db53b1a4207b3cbb4e309d05130812e with SHA-1 eb566d0a7c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12098822

Change-Id: I14d953fa55514dced16b79ddfb21aa2b9f1292a0

commit | commitdiff | tree

Automerger Merge Worker [Wed, 8 Jul 2020 00:52:08 +0000 (00:52 +0000)]

Merge "[automerger skipped] vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a -s ours am: 09b9cae24d -s ours" into rvc-d1-dev-plus-aosp am: ee0e304091 -s ours

am skip reason: Change-Id Ie27b80658db53b1a4207b3cbb4e309d05130812e with SHA-1 006eed8e3a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12098822

Change-Id: I5321840d6beb6cd57eaa06a5babb4c8da57a3d4a

commit | commitdiff | tree

Eric Biggers [Wed, 8 Jul 2020 00:51:31 +0000 (00:51 +0000)]

[automerger skipped] vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a am: 65aa48c810 -s ours am: 784638461d -s ours

am skip reason: Change-Id Ie27b80658db53b1a4207b3cbb4e309d05130812e with SHA-1 006eed8e3a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12098822

Change-Id: I871c728b23ecf0f22b01f3f95336e4a7b07a0f5b

commit | commitdiff | tree

Eric Biggers [Wed, 8 Jul 2020 00:51:12 +0000 (00:51 +0000)]

[automerger skipped] vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a am: 65aa48c810 am: 1f6e9af5b1 -s ours

am skip reason: Change-Id Ie27b80658db53b1a4207b3cbb4e309d05130812e with SHA-1 eb566d0a7c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12098822

Change-Id: I0fe158134f8aa7841997b6f91926a66f74a53d92

commit | commitdiff | tree

Automerger Merge Worker [Wed, 8 Jul 2020 00:37:31 +0000 (00:37 +0000)]

Merge "[automerger skipped] vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a -s ours am: 09b9cae24d -s ours" into rvc-d1-dev-plus-aosp

commit | commitdiff | tree

Eric Biggers [Wed, 8 Jul 2020 00:37:22 +0000 (00:37 +0000)]

[automerger skipped] vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a -s ours am: 09b9cae24d -s ours

am skip reason: Change-Id Ie27b80658db53b1a4207b3cbb4e309d05130812e with SHA-1 eb566d0a7c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12098822

Change-Id: I7d8f6f3fd29595721ee7dfbd7a2fcabf69bc041f

commit | commitdiff | tree

Eric Biggers [Wed, 8 Jul 2020 00:37:21 +0000 (00:37 +0000)]

[automerger skipped] vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a am: 65aa48c810 -s ours

am skip reason: Change-Id Ie27b80658db53b1a4207b3cbb4e309d05130812e with SHA-1 eb566d0a7c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12098822

Change-Id: Ifce40a4998e3fd5a116df5ed8b3ac3433eb6b83e

commit | commitdiff | tree

Eric Biggers [Wed, 8 Jul 2020 00:37:08 +0000 (00:37 +0000)]

vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a am: 65aa48c810

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12098822

Change-Id: I8c417d6e1a66f987717624afbea64608c65e7980

commit | commitdiff | tree

Eric Biggers [Wed, 8 Jul 2020 00:23:19 +0000 (00:23 +0000)]

vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12098822

Change-Id: Ib8656b4dbd8b39a594147aace686a3fcbd3bd0d4

commit | commitdiff | tree

Eric Biggers [Wed, 8 Jul 2020 00:22:58 +0000 (00:22 +0000)]

[automerger skipped] vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a -s ours

am skip reason: Change-Id Ie27b80658db53b1a4207b3cbb4e309d05130812e with SHA-1 eb566d0a7c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12098822

Change-Id: Id8c90f1833a171c12936a5f4aa2bf80574f5cb64

commit | commitdiff | tree

Eric Biggers [Tue, 7 Jul 2020 18:30:05 +0000 (18:30 +0000)]

Merge "vold: only allow emmc_optimized on eMMC storage" am: 428ae6e90a am: 7a1c4ccb96 am: 09f789e227 am: 4903027a20 am: 6e650513b0

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1356175

Change-Id: Iecfa55ab3b48dcb05812d80ebf52c141e80fa099

commit | commitdiff | tree

Eric Biggers [Tue, 7 Jul 2020 18:15:55 +0000 (18:15 +0000)]

Merge "vold: only allow emmc_optimized on eMMC storage" am: 428ae6e90a am: 7a1c4ccb96 am: 09f789e227 am: 4903027a20

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1356175

Change-Id: I6f8316c1eadfa2256bf515a96a45860a021ab088

commit | commitdiff | tree

Eric Biggers [Tue, 7 Jul 2020 17:59:57 +0000 (17:59 +0000)]

Merge "vold: only allow emmc_optimized on eMMC storage" am: 428ae6e90a am: 7a1c4ccb96 am: 09f789e227

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1356175

Change-Id: I277065540c289ff3a7633ebd7b0326da2da4e5a4

commit | commitdiff | tree

Eric Biggers [Tue, 7 Jul 2020 17:37:34 +0000 (17:37 +0000)]

Merge "vold: only allow emmc_optimized on eMMC storage" am: 428ae6e90a am: 7a1c4ccb96

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1356175

Change-Id: Ie124c2cec8e4235ae999463d5c03615880e0c01e

commit | commitdiff | tree

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

commit | commitdiff | tree

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
Merged-In: Ie27b80658db53b1a4207b3cbb4e309d05130812e

commit | commitdiff | tree

Eric Biggers [Tue, 7 Jul 2020 17:07:58 +0000 (17:07 +0000)]

Merge "vold: only allow emmc_optimized on eMMC storage"

commit | commitdiff | tree

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

commit | commitdiff | tree

Zim [Mon, 29 Jun 2020 18:50:47 +0000 (19:50 +0100)]

Remove persist.sys.fuse == false code paths

Since Android R, the FUSE prop is always on and FUSE-off is no longer
supported

Test: m
Bug: 160159282
Change-Id: Ic4414b850511fe3b4fc6df3f8b736d21335db820

commit | commitdiff | tree

TreeHugger Robot [Tue, 30 Jun 2020 16:05:55 +0000 (16:05 +0000)]

Merge "Change mounting storage data and obb to on by default"

commit | commitdiff | tree

Martijn Coenen [Tue, 30 Jun 2020 10:42:12 +0000 (10:42 +0000)]

Configure backing device max_ratio for FUSE filesystems. am: a485006ab1 am: bb8a543e43 am: cf0499038f am: 8fe09fd13e

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12024019

Change-Id: I0d201a35d2b9162600a447062d82e5e969f3ca9f

commit | commitdiff | tree

Automerger Merge Worker [Tue, 30 Jun 2020 10:42:02 +0000 (10:42 +0000)]

Merge "Configure backing device max_ratio for FUSE filesystems. am: a485006ab1 am: 5ed648d098 am: 6589ae36c3" into rvc-qpr-dev-plus-aosp am: 0ff981d47f

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12024019

Change-Id: I046cc19f309e5484c116951b51e28aca0d96e99d

commit | commitdiff | tree

Martijn Coenen [Tue, 30 Jun 2020 10:41:41 +0000 (10:41 +0000)]

Configure backing device max_ratio for FUSE filesystems. am: a485006ab1 am: 5ed648d098 am: c980b5387a am: 68bfed23cb

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12024019

Change-Id: Ibab97f4b5617962d39d15dc7e2db7fe6ee193eb3

commit | commitdiff | tree

Martijn Coenen [Tue, 30 Jun 2020 10:29:54 +0000 (10:29 +0000)]

Configure backing device max_ratio for FUSE filesystems. am: a485006ab1 am: bb8a543e43 am: cf0499038f

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12024019

Change-Id: I136973c26c66eae2f582885e19749753cdbff7e5

commit | commitdiff | tree

Automerger Merge Worker [Tue, 30 Jun 2020 10:29:46 +0000 (10:29 +0000)]

Merge "Configure backing device max_ratio for FUSE filesystems. am: a485006ab1 am: 5ed648d098 am: 6589ae36c3" into rvc-qpr-dev-plus-aosp

commit | commitdiff | tree

Martijn Coenen [Tue, 30 Jun 2020 10:29:41 +0000 (10:29 +0000)]

Configure backing device max_ratio for FUSE filesystems. am: a485006ab1 am: 5ed648d098 am: c980b5387a

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12024019

Change-Id: I49bec11d9aa1328d5cd7b45da098d4421af6f961

commit | commitdiff | tree

Martijn Coenen [Tue, 30 Jun 2020 10:29:37 +0000 (10:29 +0000)]

Configure backing device max_ratio for FUSE filesystems. am: a485006ab1 am: 5ed648d098 am: 6589ae36c3

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12024019

Change-Id: I20555c69735747460b0ffe137a116b566ef5b158

system/vold

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.