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

Eric Biggers [Wed, 16 Sep 2020 08:35:02 +0000 (08:35 +0000)]

[automerger skipped] vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a am: 32de8f0962 -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: Ia156e546d9051c994fe8faf52b2c65ee4d00f18a

commit | commitdiff | tree

Martijn Coenen [Wed, 16 Sep 2020 08:06:52 +0000 (08:06 +0000)]

Configure backing device max_ratio for FUSE filesystems. am: a485006ab1 am: 720331e613

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

Change-Id: Ia3914b3f34861cd020c552fc870dcb744bfcfd2c

commit | commitdiff | tree

Zim [Wed, 16 Sep 2020 05:56:42 +0000 (05:56 +0000)]

Unmount public volume if FUSE mount fails am: f71707916f am: 9589cb622d

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

Change-Id: I4bae6ee8158224ed32d2e9027958d6d6b06db7e0

commit | commitdiff | tree

David Anderson [Wed, 16 Sep 2020 04:46:10 +0000 (04:46 +0000)]

[automerger skipped] Merge "Add an isCheckpointing() binder call for adb remount." into rvc-dev am: f87198e025 am: cfc9aa57ae -s ours

am skip reason: Change-Id I33a691da3b99343acfc1e8ddf68a14504c3bfbe1 with SHA-1 7e07c53aab is in history

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

Change-Id: I444e2d98bc8edeba48421f76e83fa72bae2c5c06

commit | commitdiff | tree

Treehugger Robot [Wed, 16 Sep 2020 04:29:47 +0000 (04:29 +0000)]

Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION" am: 4e6e7e6c70 am: c9548b9d9e am: 48b6b1c767 am: 1bb7e2a438 am: 483e71b2f0

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

Change-Id: If5f1cec6418fcdbf427e0f767bb40465bc268884

commit | commitdiff | tree

Treehugger Robot [Wed, 16 Sep 2020 03:42:32 +0000 (03:42 +0000)]

Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION" am: 4e6e7e6c70 am: c9548b9d9e am: 48b6b1c767 am: 1bb7e2a438

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

Change-Id: I492bb5a2e9727164db1e856d0c12677517039ea1

commit | commitdiff | tree

Treehugger Robot [Wed, 16 Sep 2020 03:14:02 +0000 (03:14 +0000)]

Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION" am: 4e6e7e6c70 am: c9548b9d9e am: 48b6b1c767

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

Change-Id: I8704dc372c1deebd87f2e5e52c781fbe3f46978b

commit | commitdiff | tree

Treehugger Robot [Wed, 16 Sep 2020 02:26:57 +0000 (02:26 +0000)]

Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION" am: 4e6e7e6c70 am: c9548b9d9e

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

Change-Id: I65c09190aa8f6e61bda750980bfdcc06e0306d4b

commit | commitdiff | tree

TreeHugger Robot [Wed, 16 Sep 2020 02:14:53 +0000 (02:14 +0000)]

[automerger skipped] Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev am: 14d4e7c7df am: caad66f8f1 -s ours

am skip reason: Change-Id Ic15fadc67d306463dd0b554f679306d8f9081451 with SHA-1 67f9044ab5 is in history

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

Change-Id: Ie9e81369d5f648fe5553f7654f3da3a68e5282dc

commit | commitdiff | tree

Treehugger Robot [Wed, 16 Sep 2020 02:04:55 +0000 (02:04 +0000)]

Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION" am: 4e6e7e6c70

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

Change-Id: I0254ee7e493f98a78476f2e939884185b04d10c0

commit | commitdiff | tree

Treehugger Robot [Wed, 16 Sep 2020 01:24:16 +0000 (01:24 +0000)]

Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION"

commit | commitdiff | tree

Eric Biggers [Tue, 15 Sep 2020 18:55:40 +0000 (11:55 -0700)]

vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION

Nothing defines CONFIG_HW_DISK_ENCRYPTION, so remove the unused code
that's conditional on it being defined.

Change-Id: Ie435e138686eb4eac47d9aa762ae06f1645a117f

commit | commitdiff | tree

Daeho Jeong [Tue, 15 Sep 2020 02:07:09 +0000 (02:07 +0000)]

Merge "secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard" am: c5ff520a01 am: 58383d92c6 am: 79dfe789d9 am: 49c53ff16f am: b1f6599ae4

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

Change-Id: Iefc6040dc12c886dd17cac14f4a5fe93836971f4

commit | commitdiff | tree

Daeho Jeong [Tue, 15 Sep 2020 01:32:02 +0000 (01:32 +0000)]

Merge "secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard" am: c5ff520a01 am: 58383d92c6 am: 79dfe789d9 am: 49c53ff16f

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

Change-Id: Ia5ebe80acee98a90e2cb097766b3a98d10cd14c8

commit | commitdiff | tree

Daeho Jeong [Tue, 15 Sep 2020 01:13:08 +0000 (01:13 +0000)]

Merge "secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard" am: c5ff520a01 am: 58383d92c6 am: 79dfe789d9

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

Change-Id: Ie7763c4b57b5e4d78eb5e5e8f31a7dd78f550aae

commit | commitdiff | tree

Daeho Jeong [Tue, 15 Sep 2020 00:45:22 +0000 (00:45 +0000)]

Merge "secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard" am: c5ff520a01 am: 58383d92c6

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

Change-Id: I51b4ca860a8222a2a978ea96cbd68d53262ac2e3

commit | commitdiff | tree

Daeho Jeong [Tue, 15 Sep 2020 00:13:38 +0000 (00:13 +0000)]

Merge "secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard" am: c5ff520a01

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

Change-Id: I84cf17d8dd07c72a67beba46a814f51969a159ac

commit | commitdiff | tree

Daeho Jeong [Mon, 14 Sep 2020 23:50:17 +0000 (23:50 +0000)]

Merge "secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard"

commit | commitdiff | tree

Nikita Ioffe [Mon, 14 Sep 2020 23:49:38 +0000 (23:49 +0000)]

Merge "Configure read ahead for fuse mounts" into rvc-dev am: bcd7d5e7ce am: 748b7b029c

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

Change-Id: Id2ebb89657afcbe0410a2e3aefaa9329bb7cc13a

commit | commitdiff | tree

Martijn Coenen [Mon, 14 Sep 2020 23:31:12 +0000 (23:31 +0000)]

Add app's own UID to the default ACL. am: 1129b81071 am: 34836cad30

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

Change-Id: Ibd0185d3ac430097e84fe5c4ed7f2e39d2607933

commit | commitdiff | tree

Martijn Coenen [Mon, 14 Sep 2020 22:21:49 +0000 (22:21 +0000)]

Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a am: f3e337f306

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

Change-Id: I61bc4a46e38fada8529f04c6a36a2f998196e808

commit | commitdiff | tree

Abhijeet Kaur [Mon, 14 Sep 2020 21:28:50 +0000 (21:28 +0000)]

FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: c6f2533254

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

Change-Id: I176e03b63c8ec1ea5da4f18d3fbe5d429d4f249a

commit | commitdiff | tree

Daniel Rosenberg [Mon, 14 Sep 2020 21:07:59 +0000 (21:07 +0000)]

Move enabling sdcardfs behind a property am: f36bdddc7e am: 702002b226

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

Change-Id: I2e07bfe110567d62ee0eaa896f90604be486fa90

commit | commitdiff | tree

Daeho Jeong [Tue, 8 Sep 2020 03:59:28 +0000 (12:59 +0900)]

secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard

A new interface, F2FS_IOC_SEC_TRIM_FILE, has been added to F2FS
filesystem to send secure discard command to a specific file,
not to block device. We can use this interface for better discard
command handling on a file basis.

[how to use F2FS_IOC_SEC_TRIM_FILE]
start: start offset in byte (should be aligned with 4096)
len: length in byte (should be aligned with 4096, except designating EOF)
     -1 also means till EOF.
flags: F2FS_TRIM_FILE_DISCARD - sending secure discard command. If the
                                device doesn't support it, send normal
                                discard.
       F2FS_TRIM_FILE_ZEROOUT - overwrite zero data in the file.

Bug: 140759142
Test: execute "secdiscard -- <file_path>" and check the content of file
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: I6ee44a047d291274c9d70ae5e4ccccfc06a52f89

commit | commitdiff | tree

TreeHugger Robot [Sun, 13 Sep 2020 01:08:19 +0000 (01:08 +0000)]

Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 5aa1e896d0

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

Change-Id: Ice09ada3cee58f72c8b340483438a883562e05f1

commit | commitdiff | tree

Paul Crowley [Sun, 13 Sep 2020 01:08:10 +0000 (01:08 +0000)]

Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: 9c885595aa

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

Change-Id: I37f9891ad471db90cddc3640f82655af904758a0

commit | commitdiff | tree

Alistair Delva [Sun, 13 Sep 2020 01:08:03 +0000 (01:08 +0000)]

Expand virtio_block check to other virtual devices am: ff1fc9bc41 am: 16809be840

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

Change-Id: Idc5cd026405466bc5353676b627fea80623304bc

commit | commitdiff | tree

TreeHugger Robot [Sun, 13 Sep 2020 01:07:58 +0000 (01:07 +0000)]

Merge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into rvc-dev am: dbc0da396a am: 6166f150e6

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

Change-Id: Idcba6f01aef40f4387757406bf223198501799c2

commit | commitdiff | tree

Satoshi Niwa [Sun, 13 Sep 2020 01:07:52 +0000 (01:07 +0000)]

Revert "ARC++ swap for AppFuseUtil" am: 58d4044082 am: 6d22f3c331

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

Change-Id: Ifdf44a363c187f4912112b3cf923918f7ac42a38

commit | commitdiff | tree

Martijn Coenen [Sun, 13 Sep 2020 01:07:45 +0000 (01:07 +0000)]

Introduce postMount() VolumeBase helper. am: 5ec8658abc am: 9c11227024

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

Change-Id: I3975123f90a07c4b573583f47d6645766a2e828c

commit | commitdiff | tree

Treehugger Robot [Fri, 11 Sep 2020 23:30:45 +0000 (23:30 +0000)]

[automerger skipped] Merge "Add '-unstable' to solve ODR violation" am: f7794b5dc1 am: 5724e15454 -s ours am: 95177aab00 -s ours am: db1154a8f5 -s ours am: f2c76a04a9 -s ours

am skip reason: Change-Id Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424 with SHA-1 44b2f954be is in history

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

Change-Id: I9c69b976d245e49a0e0f99b06e99e29cc99014b4

commit | commitdiff | tree

Xin Li [Fri, 11 Sep 2020 21:27:34 +0000 (21:27 +0000)]

[automerger skipped] Merge "Merge Android R" am: 141c2027e2 -s ours am: 789d1d0866 -s ours am: a56f7d2608 -s ours am: 2866b9d5a8 -s ours am: 6167310291 -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: Ie8209d16085789a1b1acabab3543a5f380b25c05

commit | commitdiff | tree

Treehugger Robot [Fri, 11 Sep 2020 10:54:23 +0000 (10:54 +0000)]

[automerger skipped] Merge "Add '-unstable' to solve ODR violation" am: f7794b5dc1 am: 5724e15454 -s ours am: 95177aab00 -s ours am: db1154a8f5 -s ours

am skip reason: Change-Id Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424 with SHA-1 44b2f954be is in history

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

Change-Id: I7f72ed45082e2e5f84e18f30cadc511bd68fda9b

commit | commitdiff | tree

Treehugger Robot [Fri, 11 Sep 2020 10:14:30 +0000 (10:14 +0000)]

[automerger skipped] Merge "Add '-unstable' to solve ODR violation" am: f7794b5dc1 am: 5724e15454 -s ours am: 95177aab00 -s ours

am skip reason: Change-Id Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424 with SHA-1 44b2f954be is in history

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

Change-Id: If5b9d639b35b8c3017fb3b3dc316fb648951a737

commit | commitdiff | tree

Treehugger Robot [Fri, 11 Sep 2020 09:29:33 +0000 (09:29 +0000)]

[automerger skipped] Merge "Add '-unstable' to solve ODR violation" am: f7794b5dc1 am: 5724e15454 -s ours

am skip reason: Change-Id Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424 with SHA-1 44b2f954be is in history

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

Change-Id: Iba1f2ef22059f905091e742f8041e675a6f76d77

commit | commitdiff | tree

Treehugger Robot [Fri, 11 Sep 2020 08:40:46 +0000 (08:40 +0000)]

Merge "Add '-unstable' to solve ODR violation" am: f7794b5dc1

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

Change-Id: I44aea35571e4dff7f9f1010325f51d0e98dc01f1

commit | commitdiff | tree

Treehugger Robot [Fri, 11 Sep 2020 08:19:44 +0000 (08:19 +0000)]

Merge "Add '-unstable' to solve ODR violation"

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
Merged-In: Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424
Exempt-From-Owner-Approval: cp from internal

commit | commitdiff | tree

Xin Li [Fri, 11 Sep 2020 03:59:05 +0000 (03:59 +0000)]

[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

commit | commitdiff | tree

Xin Li [Fri, 11 Sep 2020 03:33:34 +0000 (03:33 +0000)]

[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

commit | commitdiff | tree

Xin Li [Fri, 11 Sep 2020 02:02:43 +0000 (02:02 +0000)]

[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

commit | commitdiff | tree

Xin Li [Fri, 11 Sep 2020 00:40:18 +0000 (00:40 +0000)]

[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

commit | commitdiff | tree

Xin Li [Thu, 10 Sep 2020 17:22:31 +0000 (17:22 +0000)]

Merge "Merge Android R"

commit | commitdiff | tree

Xin Li [Thu, 10 Sep 2020 03:21:28 +0000 (20:21 -0700)]

Merge Android R

Bug: 168057903
Merged-In: I477d2dfba05718c829fdb2099248a8baba1125ab
Change-Id: Ib60b99425dc79ca4c5b23772f32036f4e17ad11f

commit | commitdiff | tree

Treehugger Robot [Wed, 9 Sep 2020 14:55:19 +0000 (14:55 +0000)]

Merge "bench: Add inodeop_bench benchmark" am: e804806d79 am: 8743ef4ea6 am: 6bc12b0352 am: 062c48860a am: 524071499b

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

Change-Id: I07aa629b31de68f3cf927a29309cca22dcc4c73a

commit | commitdiff | tree

Treehugger Robot [Wed, 9 Sep 2020 14:38:08 +0000 (14:38 +0000)]

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

commit | commitdiff | tree

Treehugger Robot [Wed, 9 Sep 2020 14:17:24 +0000 (14:17 +0000)]

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

commit | commitdiff | tree

Treehugger Robot [Wed, 9 Sep 2020 13:50:13 +0000 (13:50 +0000)]

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

commit | commitdiff | tree

Treehugger Robot [Wed, 9 Sep 2020 13:34:41 +0000 (13:34 +0000)]

Merge "bench: Add inodeop_bench benchmark" am: e804806d79

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

Change-Id: I477d2dfba05718c829fdb2099248a8baba1125ab

commit | commitdiff | tree

Treehugger Robot [Wed, 9 Sep 2020 13:03:12 +0000 (13:03 +0000)]

Merge "bench: Add inodeop_bench benchmark"

commit | commitdiff | tree

Stefano Duo [Mon, 7 Sep 2020 16:30:49 +0000 (16:30 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 3 Sep 2020 20:32:44 +0000 (20:32 +0000)]

[automerger skipped] Merge "EncryptInPlace: ensure that backup superblocks get encrypted" into rvc-qpr-dev am: 9988536ecd -s ours am: 44a669176f -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: I6e3bf2f1a631ed92ee8e42357b83bbdfa3ba1587

commit | commitdiff | tree

TreeHugger Robot [Thu, 3 Sep 2020 20:32:07 +0000 (20:32 +0000)]

[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

commit | commitdiff | tree

TreeHugger Robot [Thu, 3 Sep 2020 20:10:55 +0000 (20:10 +0000)]

Merge "EncryptInPlace: ensure that backup superblocks get encrypted" into rvc-qpr-dev

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

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
Merged-In: Ic090bf4e88193b289b04c5254ddf661ef40b037e
Change-Id: Ic090bf4e88193b289b04c5254ddf661ef40b037e

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

system/vold

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.