OSDN Git Service

android-x86/system-vold.git
4 years ago[incfs] Use new IncFs_ReleaseControlFds() instead of duping am: fc7b6697b4 am: 12ffb988c2
Yurii Zubrytskyi [Thu, 23 Apr 2020 22:10:25 +0000 (22:10 +0000)]
[incfs] Use new IncFs_ReleaseControlFds() instead of duping am: fc7b6697b4 am: 12ffb988c2

Change-Id: I38befec68c23961e91199cda680b06ef077058a9

4 years ago[incfs] Use new IncFs_ReleaseControlFds() instead of duping am: fc7b6697b4
Yurii Zubrytskyi [Thu, 23 Apr 2020 21:56:23 +0000 (21:56 +0000)]
[incfs] Use new IncFs_ReleaseControlFds() instead of duping am: fc7b6697b4

Change-Id: Ieff848e641fe40d7a199e460f327ef8aba041dae

4 years ago[incfs] Use new IncFs_ReleaseControlFds() instead of duping
Yurii Zubrytskyi [Thu, 23 Apr 2020 06:23:24 +0000 (23:23 -0700)]
[incfs] Use new IncFs_ReleaseControlFds() instead of duping

Vold needs to pass / accept IncFs control via Binder, so it
neeeds to get and put its internal FDs in and out. Using the new
release() function it works without extra fd duping

Bug: 153704006
Test: builds & boots
Change-Id: I64bc5b1ca9f2c69e34c3a860ed3edbe58bd9ea29

4 years ago[automerger skipped] Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key proper...
Treehugger Robot [Tue, 21 Apr 2020 16:34:03 +0000 (16:34 +0000)]
[automerger skipped] Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" am: 83c78a2bb1 am: ebcd59d19b -s ours am: bcbddda15a -s ours

am skip reason: Change-Id I562df49deffdccdb2cfd657130fc05b24d40a6a6 with SHA-1 78f806198f is in history

Change-Id: I8cdb012f5976e3c964e16dff9da9541831442734

4 years ago[automerger skipped] Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key proper...
Treehugger Robot [Tue, 21 Apr 2020 16:20:32 +0000 (16:20 +0000)]
[automerger skipped] Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" am: 83c78a2bb1 am: ebcd59d19b -s ours

am skip reason: Change-Id I562df49deffdccdb2cfd657130fc05b24d40a6a6 with SHA-1 78f806198f is in history

Change-Id: Ib183a53d8b49427ddf243d22db5df1f4b2b9815e

4 years agoMerge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" am: 83c78a2bb1
Treehugger Robot [Tue, 21 Apr 2020 16:07:15 +0000 (16:07 +0000)]
Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" am: 83c78a2bb1

Change-Id: Icfcf0222bd97d52d6fed2eeef3c3fca335d8b93e

4 years agoMerge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property"
Treehugger Robot [Tue, 21 Apr 2020 15:51:20 +0000 (15:51 +0000)]
Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property"

4 years agoMerge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" into rvc-dev...
Nikita Ioffe [Tue, 21 Apr 2020 14:56:52 +0000 (14:56 +0000)]
Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" into rvc-dev am: 4e1e7ef09a am: c1dce0695b

Change-Id: I79b552aff86e7482aac3d2c819061c2dc1187a2c

4 years agoMerge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" into rvc-dev...
Nikita Ioffe [Tue, 21 Apr 2020 14:56:30 +0000 (14:56 +0000)]
Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" into rvc-dev am: 4e1e7ef09a am: a2596ddf5e

Change-Id: I28234153e1d3e470e8fc11de6ec890f5b9927987

4 years agoMerge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" into rvc-dev...
Nikita Ioffe [Tue, 21 Apr 2020 14:44:48 +0000 (14:44 +0000)]
Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" into rvc-dev am: 4e1e7ef09a

Change-Id: I6c88e5725a1e8ed3300bfeda5bed26b0c8875e72

4 years agoMerge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" into rvc-dev...
Nikita Ioffe [Tue, 21 Apr 2020 14:44:12 +0000 (14:44 +0000)]
Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" into rvc-dev am: 4e1e7ef09a

Change-Id: I1d4f16c45ac8082ae5c6aa7216a4636a32e0c0b7

4 years agoIntroduce ro.crypto.uses_fs_ioc_add_encryption_key property
Nikita Ioffe [Mon, 20 Apr 2020 21:21:49 +0000 (22:21 +0100)]
Introduce ro.crypto.uses_fs_ioc_add_encryption_key property

Bug: 154327249
Test: adb shell getprop ro.crypto.uses_fs_ioc_add_encryption_key
Test: adb bugreport && checked content contains new property
Change-Id: I562df49deffdccdb2cfd657130fc05b24d40a6a6
Merged-In: I562df49deffdccdb2cfd657130fc05b24d40a6a6
(cherry picked from commit 78f806198f85ca37abb617235c89abaca7d1c19c)

4 years agoMerge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" into rvc-dev
Nikita Ioffe [Tue, 21 Apr 2020 14:27:18 +0000 (14:27 +0000)]
Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" into rvc-dev

4 years agoMerge "Don't do private app-dir permissions/quota on public volumes." into rvc-dev...
Martijn Coenen [Tue, 21 Apr 2020 12:57:05 +0000 (12:57 +0000)]
Merge "Don't do private app-dir permissions/quota on public volumes." into rvc-dev am: 15070b1833 am: 9c306323e2

Change-Id: Id5783521ac78c56a16092c7110d61cc2018889ea

4 years agoMerge "Don't do private app-dir permissions/quota on public volumes." into rvc-dev...
Martijn Coenen [Tue, 21 Apr 2020 12:55:54 +0000 (12:55 +0000)]
Merge "Don't do private app-dir permissions/quota on public volumes." into rvc-dev am: 15070b1833 am: fcabee6875

Change-Id: I5d0aefd5507b69b1fc9cc3d85f894a0137aed24e

4 years agoMerge "Don't do private app-dir permissions/quota on public volumes." into rvc-dev...
Martijn Coenen [Tue, 21 Apr 2020 12:42:22 +0000 (12:42 +0000)]
Merge "Don't do private app-dir permissions/quota on public volumes." into rvc-dev am: 15070b1833

Change-Id: Ibc6535772cd77c1f68c380e0993f79fdacca55e1

4 years agoMerge "Don't do private app-dir permissions/quota on public volumes." into rvc-dev...
Martijn Coenen [Tue, 21 Apr 2020 12:41:54 +0000 (12:41 +0000)]
Merge "Don't do private app-dir permissions/quota on public volumes." into rvc-dev am: 15070b1833

Change-Id: I5b5d4b3f8b8b3ed94264eb79261097b1b93f53a2

4 years agoMerge "Don't do private app-dir permissions/quota on public volumes." into rvc-dev
Martijn Coenen [Tue, 21 Apr 2020 12:22:58 +0000 (12:22 +0000)]
Merge "Don't do private app-dir permissions/quota on public volumes." into rvc-dev

4 years agoMerge "Bind mount install and android writable DATA and OBB dirs" into rvc-dev am...
TreeHugger Robot [Tue, 21 Apr 2020 11:40:53 +0000 (11:40 +0000)]
Merge "Bind mount install and android writable DATA and OBB dirs" into rvc-dev am: 086c96ef6d am: 92cd800665

Change-Id: I1e6a6466b1ec651aa74dfc0f54891386f3f0e6f9

4 years agoMerge "Bind mount install and android writable DATA and OBB dirs" into rvc-dev am...
TreeHugger Robot [Tue, 21 Apr 2020 11:27:34 +0000 (11:27 +0000)]
Merge "Bind mount install and android writable DATA and OBB dirs" into rvc-dev am: 086c96ef6d am: 95d66bc103

Change-Id: I6591dfe84b51e07b7920448ade66c99eee0746d1

4 years agoMerge "Bind mount install and android writable DATA and OBB dirs" into rvc-dev am...
TreeHugger Robot [Tue, 21 Apr 2020 11:25:16 +0000 (11:25 +0000)]
Merge "Bind mount install and android writable DATA and OBB dirs" into rvc-dev am: 086c96ef6d

Change-Id: I288fc55dffe20f273be3e74e4fe4d69b29d13da0

4 years agoMerge "Bind mount install and android writable DATA and OBB dirs" into rvc-dev am...
TreeHugger Robot [Tue, 21 Apr 2020 11:24:14 +0000 (11:24 +0000)]
Merge "Bind mount install and android writable DATA and OBB dirs" into rvc-dev am: 086c96ef6d

Change-Id: I227d66a376dad24ca40612849fa8259ba4dd0aae

4 years agoMerge "Bind mount install and android writable DATA and OBB dirs" into rvc-dev
TreeHugger Robot [Tue, 21 Apr 2020 11:08:07 +0000 (11:08 +0000)]
Merge "Bind mount install and android writable DATA and OBB dirs" into rvc-dev

4 years agoIntroduce ro.crypto.uses_fs_ioc_add_encryption_key property
Nikita Ioffe [Mon, 20 Apr 2020 21:21:49 +0000 (22:21 +0100)]
Introduce ro.crypto.uses_fs_ioc_add_encryption_key property

Bug: 154327249
Test: adb shell getprop ro.crypto.uses_fs_ioc_add_encryption_key
Test: adb bugreport && checked content contains new property
Change-Id: I562df49deffdccdb2cfd657130fc05b24d40a6a6

4 years agoBind mount install and android writable DATA and OBB dirs
Ricky Wai [Tue, 7 Apr 2020 12:43:20 +0000 (13:43 +0100)]
Bind mount install and android writable DATA and OBB dirs

To improvement performance, and also making them able to list
the dirs.

This should also be fine under b/151055432, as the whole obb
directory is mounted, renameTo() from installer to apps should be
a move not copy.

Bug: 153422990
Bug: 153540919
Test: atest AdoptableHostTest
Change-Id: Ia18fd4393db14a0f11d6e5b947dd716515bdeeef

4 years agoDon't do private app-dir permissions/quota on public volumes.
Martijn Coenen [Mon, 20 Apr 2020 13:14:48 +0000 (15:14 +0200)]
Don't do private app-dir permissions/quota on public volumes.

While looking at some emulator logs, I noticed that we fail to create
dirs like /Android/data/com.foo/cache on public volumes, because we try
to chmod it; public volumes go completely through FUSE, even for
Android/, and so these operations will fail, because the underlying
UID/GID is not setup correctly.

Really the only thing we really have to do on public volumes is create
the dirs, like we used to do.

Bug: 152618535
Test: manually verify cache dirs can be created successfully
Change-Id: I66e5d0873f1198123787943b17b468eadf0a853d

4 years agoRename casefold/projectid properties (for f2fs). am: e9239f757e am: 3426c36540
Martijn Coenen [Fri, 17 Apr 2020 15:01:56 +0000 (15:01 +0000)]
Rename casefold/projectid properties (for f2fs). am: e9239f757e am: 3426c36540

Change-Id: I2529bbc678856ad6245b84b533631df4b763965d

4 years agoRename casefold/projectid properties (for f2fs). am: e9239f757e am: c41ac2f3d7
Martijn Coenen [Fri, 17 Apr 2020 15:01:20 +0000 (15:01 +0000)]
Rename casefold/projectid properties (for f2fs). am: e9239f757e am: c41ac2f3d7

Change-Id: I46f8f30b392c121bdcd0b8d5e7eb70fadbe6b633

4 years agoRename casefold/projectid properties (for f2fs). am: e9239f757e
Martijn Coenen [Fri, 17 Apr 2020 14:41:07 +0000 (14:41 +0000)]
Rename casefold/projectid properties (for f2fs). am: e9239f757e

Change-Id: Ib895adcd495dd3dc4e9d675d1990d04b173a1b14

4 years agoRename casefold/projectid properties (for f2fs). am: e9239f757e
Martijn Coenen [Fri, 17 Apr 2020 14:40:56 +0000 (14:40 +0000)]
Rename casefold/projectid properties (for f2fs). am: e9239f757e

Change-Id: I6829424a1ecee05ef8784159789a3a9991d897be

4 years agoMerge "[automerger skipped] Rename casefold/projectid properties. am: aee6b6fccd...
Automerger Merge Worker [Fri, 17 Apr 2020 08:24:29 +0000 (08:24 +0000)]
Merge "[automerger skipped] Rename casefold/projectid properties. am: aee6b6fccd -s ours am: d4de3bd143 -s ours" into rvc-d1-dev-plus-aosp

4 years ago[automerger skipped] Rename casefold/projectid properties. am: aee6b6fccd -s ours...
Martijn Coenen [Fri, 17 Apr 2020 08:24:22 +0000 (08:24 +0000)]
[automerger skipped] Rename casefold/projectid properties. am: aee6b6fccd -s ours am: d4de3bd143 -s ours

am skip reason: Change-Id Iaebff2a835288839a2faf0edbe0e47ceb96b4458 with SHA-1 97ff0845e2 is in history

Change-Id: Ieb4f5184e6428db1023a78bd2f492bc2827b8170

4 years ago[automerger skipped] Rename casefold/projectid properties. am: aee6b6fccd am: f417e12...
Martijn Coenen [Fri, 17 Apr 2020 08:24:13 +0000 (08:24 +0000)]
[automerger skipped] Rename casefold/projectid properties. am: aee6b6fccd am: f417e12e56 -s ours

am skip reason: Change-Id Iaebff2a835288839a2faf0edbe0e47ceb96b4458 with SHA-1 97ff0845e2 is in history

Change-Id: I3e1e7c803956c895d976368b64481f42dfcf3c5c

4 years agoRename casefold/projectid properties. am: aee6b6fccd
Martijn Coenen [Fri, 17 Apr 2020 08:10:36 +0000 (08:10 +0000)]
Rename casefold/projectid properties. am: aee6b6fccd

Change-Id: I43a490414c4bd816edb707ba350b4ee151133f8f

4 years ago[automerger skipped] Rename casefold/projectid properties. am: aee6b6fccd -s ours
Martijn Coenen [Fri, 17 Apr 2020 08:10:15 +0000 (08:10 +0000)]
[automerger skipped] Rename casefold/projectid properties. am: aee6b6fccd -s ours

am skip reason: Change-Id Iaebff2a835288839a2faf0edbe0e47ceb96b4458 with SHA-1 97ff0845e2 is in history

Change-Id: If48e613ce1fba64f6bf9bf8613ce93d76cf8b31f

4 years agoMerge "Rename casefold/projectid properties." am: 9d0508a854 am: 5901d6f492 am: 729c2...
Martijn Coenen [Thu, 16 Apr 2020 08:59:27 +0000 (08:59 +0000)]
Merge "Rename casefold/projectid properties." am: 9d0508a854 am: 5901d6f492 am: 729c26033e

Change-Id: Ib6e0fea59e67396bd6b3e88d18e20b88cf17aac8

4 years agoMerge "Rename casefold/projectid properties." am: 9d0508a854 am: 5901d6f492
Martijn Coenen [Thu, 16 Apr 2020 08:35:08 +0000 (08:35 +0000)]
Merge "Rename casefold/projectid properties." am: 9d0508a854 am: 5901d6f492

Change-Id: Ic9982c15351008ff686f9bf395ae8f3b4adcdb30

4 years agoMerge "Rename casefold/projectid properties." am: 9d0508a854
Martijn Coenen [Thu, 16 Apr 2020 08:21:00 +0000 (08:21 +0000)]
Merge "Rename casefold/projectid properties." am: 9d0508a854

Change-Id: If27cbdd3df8bb53b8e27a772be9b0826a8fce4e4

4 years agoRename casefold/projectid properties (for f2fs).
Martijn Coenen [Thu, 16 Apr 2020 08:16:29 +0000 (10:16 +0200)]
Rename casefold/projectid properties (for f2fs).

According to property naming guidelines.

Bug: 152170470
Bug: 153525566
Test: N/A
Change-Id: Iad1caff6e5cfb7f6a09b77532d64a24de9b0b3c6

4 years agoRename casefold/projectid properties.
Martijn Coenen [Wed, 15 Apr 2020 09:42:47 +0000 (11:42 +0200)]
Rename casefold/projectid properties.

According to property naming guidelines.

Bug: 152170470
Bug: 153525566
Test: N/A
Change-Id: Iaebff2a835288839a2faf0edbe0e47ceb96b4458
Merged-In: Iaebff2a835288839a2faf0edbe0e47ceb96b4458

4 years agoMerge "Rename casefold/projectid properties."
Martijn Coenen [Thu, 16 Apr 2020 08:06:53 +0000 (08:06 +0000)]
Merge "Rename casefold/projectid properties."

4 years agoRename casefold/projectid properties.
Martijn Coenen [Wed, 15 Apr 2020 09:42:47 +0000 (11:42 +0200)]
Rename casefold/projectid properties.

According to property naming guidelines.

Bug: 152170470
Bug: 153525566
Test: N/A
Change-Id: Iaebff2a835288839a2faf0edbe0e47ceb96b4458

4 years agoMerge changes from topic "fscompression" am: 7f4a71c2ff am: 0f5df6477d am: 564f7e7713
Jaegeuk Kim [Tue, 14 Apr 2020 16:38:23 +0000 (16:38 +0000)]
Merge changes from topic "fscompression" am: 7f4a71c2ff am: 0f5df6477d am: 564f7e7713

Change-Id: Idde972ed6fbaa53b0b8b767f184c96562e57459e

4 years agovold: support F2FS compression am: f64d30aa82 am: 0770085201 am: d6cf8998e2
Jaegeuk Kim [Tue, 14 Apr 2020 16:38:21 +0000 (16:38 +0000)]
vold: support F2FS compression am: f64d30aa82 am: 0770085201 am: d6cf8998e2

Change-Id: Iefddee319311b25fbe3f60ed4f1669e4cca16569

4 years agoMerge changes from topic "fscompression" am: 7f4a71c2ff am: 0f5df6477d
Jaegeuk Kim [Tue, 14 Apr 2020 16:09:28 +0000 (16:09 +0000)]
Merge changes from topic "fscompression" am: 7f4a71c2ff am: 0f5df6477d

Change-Id: I3b1d5956b6c3783b14b203c1d6d234d6b97667f7

4 years agovold: support F2FS compression am: f64d30aa82 am: 0770085201
Jaegeuk Kim [Tue, 14 Apr 2020 16:09:24 +0000 (16:09 +0000)]
vold: support F2FS compression am: f64d30aa82 am: 0770085201

Change-Id: I3bef3bef7704f7ef12a8774064ec1382fa4801d1

4 years agoMerge changes from topic "fscompression" am: 7f4a71c2ff
Jaegeuk Kim [Tue, 14 Apr 2020 15:58:32 +0000 (15:58 +0000)]
Merge changes from topic "fscompression" am: 7f4a71c2ff

Change-Id: I42086b7abde79ae1edb177f3668c73b1c7972295

4 years agovold: support F2FS compression am: f64d30aa82
Jaegeuk Kim [Tue, 14 Apr 2020 15:58:30 +0000 (15:58 +0000)]
vold: support F2FS compression am: f64d30aa82

Change-Id: I03d6c574c922f08c67a662e483a1ed05ea7c4351

4 years agoMerge changes from topic "fscompression"
Jaegeuk Kim [Tue, 14 Apr 2020 15:54:18 +0000 (15:54 +0000)]
Merge changes from topic "fscompression"

* changes:
  vold: clean up configuration set
  vold: support F2FS compression

4 years agovold: clean up configuration set
Jaegeuk Kim [Mon, 6 Apr 2020 22:58:41 +0000 (15:58 -0700)]
vold: clean up configuration set

This patch introduces a structure to manipulate many configuration flags.

Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Ib15d2b6e251741160d2febe695132a37f9dde23c

4 years ago[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp...
Xin Li [Fri, 10 Apr 2020 03:29:49 +0000 (03:29 +0000)]
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: b4a3c55026 -s ours am: 64a17820a5

Change-Id: Icabf2aa5c4037248aa36ad9df1d9107238b35ab3

4 years ago[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp...
Xin Li [Fri, 10 Apr 2020 03:08:48 +0000 (03:08 +0000)]
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: b4a3c55026 -s ours

am skip reason: subject contains skip directive

Change-Id: I7f117d3116a53998624318365c8117df3ad4e3a6

4 years agoDO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master
Xin Li [Fri, 10 Apr 2020 00:51:30 +0000 (17:51 -0700)]
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master

Bug: 151763422
Change-Id: I04b8a113f3194fc4de80da1f4c0f9551115e6529

4 years ago[automerger skipped] Merge "Send earlyBootEnded notice to all Keymasters" am: 0e9fbe4...
Treehugger Robot [Thu, 9 Apr 2020 23:15:40 +0000 (23:15 +0000)]
[automerger skipped] Merge "Send earlyBootEnded notice to all Keymasters" am: 0e9fbe4a3e am: 483de9f5fd -s ours am: 6a11ad41dd -s ours

am skip reason: Change-Id Id8f01a1dc7d2398395f369c3ea74656a82888829 with SHA-1 50397a72f1 is in history

Change-Id: I097761c78070dbc69893d0a48e6815b06a0e0316

4 years ago[automerger skipped] Merge "Send earlyBootEnded notice to all Keymasters" am: 0e9fbe4...
Treehugger Robot [Thu, 9 Apr 2020 22:52:28 +0000 (22:52 +0000)]
[automerger skipped] Merge "Send earlyBootEnded notice to all Keymasters" am: 0e9fbe4a3e am: 483de9f5fd -s ours

am skip reason: Change-Id Id8f01a1dc7d2398395f369c3ea74656a82888829 with SHA-1 50397a72f1 is in history

Change-Id: Ib4400fdb5f38dfb2ac9eb9b93318f34601101ddc

4 years agoMerge "Send earlyBootEnded notice to all Keymasters" am: 0e9fbe4a3e
Treehugger Robot [Thu, 9 Apr 2020 22:31:09 +0000 (22:31 +0000)]
Merge "Send earlyBootEnded notice to all Keymasters" am: 0e9fbe4a3e

Change-Id: Ia8f5e55336e3a4d0a71d353b2f28553cf6196bd6

4 years agoMerge "Send earlyBootEnded notice to all Keymasters"
Treehugger Robot [Thu, 9 Apr 2020 22:07:40 +0000 (22:07 +0000)]
Merge "Send earlyBootEnded notice to all Keymasters"

4 years agoSend earlyBootEnded notice to all Keymasters
Shawn Willden [Wed, 1 Apr 2020 16:02:16 +0000 (10:02 -0600)]
Send earlyBootEnded notice to all Keymasters

Vold incorrectly sends the earlyBootEnded signal only to the Keymaster
instance used for device encryption, but all of them need it.

Bug: 152932559
Test: VtsHalKeymasterV4_1TargetTest
Merged-In: Id8f01a1dc7d2398395f369c3ea74656a82888829
Change-Id: Id8f01a1dc7d2398395f369c3ea74656a82888829

4 years ago[automerger skipped] Merge "Choose options format using property" into rvc-dev am...
TreeHugger Robot [Wed, 8 Apr 2020 00:37:21 +0000 (00:37 +0000)]
[automerger skipped] Merge "Choose options format using property" into rvc-dev am: 0fbd0c1542 -s ours am: 1ece05143d -s ours

am skip reason: Change-Id Ib51071b7c316ce074de72439741087b18335048c with SHA-1 4073c0b524 is in history

Change-Id: I6231b7fd4136dba927e62566ca75cc84a6d0e376

4 years ago[automerger skipped] Merge "Choose options format using property" into rvc-dev am...
TreeHugger Robot [Wed, 8 Apr 2020 00:37:07 +0000 (00:37 +0000)]
[automerger skipped] Merge "Choose options format using property" into rvc-dev am: 0fbd0c1542 am: a46dc6fe7a -s ours

am skip reason: Change-Id Ib51071b7c316ce074de72439741087b18335048c with SHA-1 f56d553bab is in history

Change-Id: Iaadd82296aeb4412031e0eaf03a209156e738fce

4 years agoMerge "Choose options format using property" into rvc-dev am: 0fbd0c1542
TreeHugger Robot [Wed, 8 Apr 2020 00:24:40 +0000 (00:24 +0000)]
Merge "Choose options format using property" into rvc-dev am: 0fbd0c1542

Change-Id: I2d891dd6a28c8f599b68a5df840d0d331fc1c440

4 years ago[automerger skipped] Merge "Choose options format using property" into rvc-dev am...
TreeHugger Robot [Wed, 8 Apr 2020 00:24:33 +0000 (00:24 +0000)]
[automerger skipped] Merge "Choose options format using property" into rvc-dev am: 0fbd0c1542 -s ours

am skip reason: Change-Id Ib51071b7c316ce074de72439741087b18335048c with SHA-1 f56d553bab is in history

Change-Id: I3500b37255c57f5dd74307801e9833ea6bdea08d

4 years agoMerge "Choose options format using property" into rvc-dev
TreeHugger Robot [Wed, 8 Apr 2020 00:10:59 +0000 (00:10 +0000)]
Merge "Choose options format using property" into rvc-dev

4 years agoChoose options format using property
Paul Crowley [Sun, 22 Mar 2020 15:02:06 +0000 (08:02 -0700)]
Choose options format using property

To make it easier to support disk formats created using old versions
of dm-default-key with new kernels, choose the disk format to use
based on options_format_version and first_api_version properties
instead of checking the version number of the kernel module.

Bug: 150761030
Test: crosshatch and cuttlefish boot normally; cuttlefish
    fails with "default-key: Not enough arguments" as expected when
    option is set to 1
Cherry-Picked-From: f56d553babc368e557fe90513e78a5ba06626b0d
Merged-In: Ib51071b7c316ce074de72439741087b18335048c
Change-Id: Ib51071b7c316ce074de72439741087b18335048c

4 years agoMerge "Choose options format using property" am: 479588c68e am: 30c1b0225e am: 7f076f9142
Paul Crowley [Tue, 7 Apr 2020 04:29:39 +0000 (04:29 +0000)]
Merge "Choose options format using property" am: 479588c68e am: 30c1b0225e am: 7f076f9142

Change-Id: I5e91aeeee4a64704ffe9ad5a425e91065e18d8e2

4 years agoMerge "Choose options format using property" am: 479588c68e am: 30c1b0225e
Paul Crowley [Tue, 7 Apr 2020 04:08:32 +0000 (04:08 +0000)]
Merge "Choose options format using property" am: 479588c68e am: 30c1b0225e

Change-Id: Id82ce73849059e7792422023afc66cba13833ecc

4 years agoMerge "Choose options format using property" am: 479588c68e am: 30c1b0225e
Paul Crowley [Tue, 7 Apr 2020 04:07:38 +0000 (04:07 +0000)]
Merge "Choose options format using property" am: 479588c68e am: 30c1b0225e

Change-Id: Ic6b4c8e252ea9f3285c0646c7ed26d0bb54a2a88

4 years agoMerge "Choose options format using property" am: 479588c68e
Paul Crowley [Tue, 7 Apr 2020 03:48:07 +0000 (03:48 +0000)]
Merge "Choose options format using property" am: 479588c68e

Change-Id: I67523617a54957da6a3fae7cd9233ff47627578d

4 years agoMerge "Choose options format using property"
Paul Crowley [Tue, 7 Apr 2020 03:23:57 +0000 (03:23 +0000)]
Merge "Choose options format using property"

4 years agoChoose options format using property
Paul Crowley [Sun, 22 Mar 2020 15:02:06 +0000 (08:02 -0700)]
Choose options format using property

To make it easier to support disk formats created using old versions
of dm-default-key with new kernels, choose the disk format to use
based on options_format_version and first_api_version properties
instead of checking the version number of the kernel module.

Bug: 150761030
Test: crosshatch and cuttlefish boot normally; cuttlefish
    fails with "default-key: Not enough arguments" as expected when
    option is set to 1
Change-Id: Ib51071b7c316ce074de72439741087b18335048c

4 years agoAdditional operation check when enabling read logs. am: 605a44fe93 am: fb9001b917
Alex Buynytskyy [Sat, 4 Apr 2020 04:11:32 +0000 (04:11 +0000)]
Additional operation check when enabling read logs. am: 605a44fe93 am: fb9001b917

Change-Id: Icdeed4b0ebb5a8d0a6bbaa1a84159d7b4f3e0518

4 years agoAdditional operation check when enabling read logs. am: 605a44fe93 am: 5cbdc3153c
Alex Buynytskyy [Sat, 4 Apr 2020 04:11:23 +0000 (04:11 +0000)]
Additional operation check when enabling read logs. am: 605a44fe93 am: 5cbdc3153c

Change-Id: I7784c336f6a59d46297e2adc1d5df7b1bf8d7b89

4 years agoAdditional operation check when enabling read logs. am: 605a44fe93
Alex Buynytskyy [Sat, 4 Apr 2020 04:08:57 +0000 (04:08 +0000)]
Additional operation check when enabling read logs. am: 605a44fe93

Change-Id: Ie068daae873a7796873e4170cd18617d8161916f

4 years agoAdditional operation check when enabling read logs. am: 605a44fe93
Alex Buynytskyy [Sat, 4 Apr 2020 04:08:31 +0000 (04:08 +0000)]
Additional operation check when enabling read logs. am: 605a44fe93

Change-Id: I6b91438709189302d4afe64d3d5dfe28fadd513d

4 years agoAdditional operation check when enabling read logs.
Alex Buynytskyy [Thu, 2 Apr 2020 22:21:47 +0000 (15:21 -0700)]
Additional operation check when enabling read logs.

Vold now does not check caller's permission, but only accepts
transactions from system_server. And it's up to system server to do the
right thing and check permissions/appops.

Bug: b/152633648
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest
Test: adb shell appops set 1000 GET_USAGE_STATS deny
Change-Id: Id56c1673b135b72b3ec86e572aa4bcca3afc19ab

4 years agovold: support F2FS compression
Jaegeuk Kim [Tue, 14 Jan 2020 19:22:26 +0000 (11:22 -0800)]
vold: support F2FS compression

Bug: 134580167
Change-Id: Iadd001dc5ce0f91a4337f5b27ea8cc54f9760b0d
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
4 years ago[automerger skipped] Merge "[vold] update with incfs_ndk.h" am: 29ee196fb5 am: e296f9...
Yurii Zubrytskyi [Fri, 3 Apr 2020 18:29:35 +0000 (18:29 +0000)]
[automerger skipped] Merge "[vold] update with incfs_ndk.h" am: 29ee196fb5 am: e296f9cbf6 -s ours am: 16548b2538 -s ours

am skip reason: Change-Id I5166c49cf48f353dab35e385571ada517cb751ac with SHA-1 01c4e91c09 is in history

Change-Id: I99067123652e0479f66bfb232a0a752c7a66bd8a

4 years agoMerge "[vold] update with incfs_ndk.h" am: 29ee196fb5 am: e296f9cbf6
Yurii Zubrytskyi [Fri, 3 Apr 2020 18:10:50 +0000 (18:10 +0000)]
Merge "[vold] update with incfs_ndk.h" am: 29ee196fb5 am: e296f9cbf6

Change-Id: I0173898669ca7d4b3a03449d2488f69cddb0ba3f

4 years ago[automerger skipped] Merge "[vold] update with incfs_ndk.h" am: 29ee196fb5 am: e296f9...
Yurii Zubrytskyi [Fri, 3 Apr 2020 18:09:40 +0000 (18:09 +0000)]
[automerger skipped] Merge "[vold] update with incfs_ndk.h" am: 29ee196fb5 am: e296f9cbf6 -s ours

am skip reason: Change-Id I5166c49cf48f353dab35e385571ada517cb751ac with SHA-1 01c4e91c09 is in history

Change-Id: I954834a99ef8253dee7ed1cd5d776dbc405427c6

4 years agoMerge "[vold] update with incfs_ndk.h" am: 29ee196fb5
Yurii Zubrytskyi [Fri, 3 Apr 2020 17:49:01 +0000 (17:49 +0000)]
Merge "[vold] update with incfs_ndk.h" am: 29ee196fb5

Change-Id: If51dfb7c76c6593ecf31c2b42712c4ac114d2b83

4 years agoMerge "[vold] update with incfs_ndk.h"
Yurii Zubrytskyi [Fri, 3 Apr 2020 17:25:05 +0000 (17:25 +0000)]
Merge "[vold] update with incfs_ndk.h"

4 years agoReplace EnsureDirExists with a call to setupAppDir am: 75973cb0dd am: f7dccbbf7b
Linus Tufvesson [Fri, 3 Apr 2020 13:57:15 +0000 (13:57 +0000)]
Replace EnsureDirExists with a call to setupAppDir am: 75973cb0dd am: f7dccbbf7b

Change-Id: I9e53375877cf12355dc69fb869a2459c535adfec

4 years agoReplace EnsureDirExists with a call to setupAppDir am: 75973cb0dd am: c00e508709
Linus Tufvesson [Fri, 3 Apr 2020 13:56:15 +0000 (13:56 +0000)]
Replace EnsureDirExists with a call to setupAppDir am: 75973cb0dd am: c00e508709

Change-Id: Id7cfffae9142d4624d764ddc286ec6633bc208d6

4 years agoReplace EnsureDirExists with a call to setupAppDir am: 75973cb0dd
Linus Tufvesson [Fri, 3 Apr 2020 13:28:37 +0000 (13:28 +0000)]
Replace EnsureDirExists with a call to setupAppDir am: 75973cb0dd

Change-Id: I7cc9c77bd27c459684698069cd85f544d8cb2571

4 years agoReplace EnsureDirExists with a call to setupAppDir am: 75973cb0dd
Linus Tufvesson [Fri, 3 Apr 2020 13:28:11 +0000 (13:28 +0000)]
Replace EnsureDirExists with a call to setupAppDir am: 75973cb0dd

Change-Id: I58cb29e233e98b588a2e66797bd260b548059ca2

4 years agoReplace EnsureDirExists with a call to setupAppDir
Linus Tufvesson [Mon, 23 Mar 2020 11:59:43 +0000 (11:59 +0000)]
Replace EnsureDirExists with a call to setupAppDir

Test: Manually verified ownership of /storage/emulated/0/Android/data on cf_x86_phone-userdebug after enabling feature
Bug: 151455752

Change-Id: I75a1e3b769476e56094e41d82e7f8e1a72827ded

4 years agoMerge "Merge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev...
Automerger Merge Worker [Thu, 2 Apr 2020 01:05:38 +0000 (01:05 +0000)]
Merge "Merge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev am: 6ce90ced12 am: 19e3a19d75" into rvc-d1-dev-plus-aosp

4 years agoMerge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev am: 6ce90...
Alex Buynytskyy [Thu, 2 Apr 2020 01:05:30 +0000 (01:05 +0000)]
Merge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev am: 6ce90ced12 am: 31e2a7c5c5

Change-Id: I8d7fababb1b1824a516d7bcb82b6d7712d6367d0

4 years agoMerge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev am: 6ce90...
Alex Buynytskyy [Thu, 2 Apr 2020 01:05:19 +0000 (01:05 +0000)]
Merge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev am: 6ce90ced12 am: 19e3a19d75

Change-Id: I60511ff9d50f0ea79d503e455b41075ae45e6718

4 years agoMerge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev am: 6ce90...
Alex Buynytskyy [Thu, 2 Apr 2020 00:48:17 +0000 (00:48 +0000)]
Merge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev am: 6ce90ced12

Change-Id: I9b04f7a6201cf148c310dc7c1598c40076839f64

4 years agoMerge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev am: 6ce90...
Alex Buynytskyy [Thu, 2 Apr 2020 00:48:13 +0000 (00:48 +0000)]
Merge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev am: 6ce90ced12

Change-Id: Ib92de641097b748c417e0d4dfdc21213da7fd789

4 years agoMerge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev
Alex Buynytskyy [Thu, 2 Apr 2020 00:36:26 +0000 (00:36 +0000)]
Merge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev

4 years ago[vold] update with incfs_ndk.h
Songchun Fan [Wed, 4 Mar 2020 01:58:20 +0000 (17:58 -0800)]
[vold] update with incfs_ndk.h

BUG: 150470163
Test: atest PackageManagerShellCommandIncrementalTest
Change-Id: I5166c49cf48f353dab35e385571ada517cb751ac
Merged-In: I5166c49cf48f353dab35e385571ada517cb751ac

4 years agoMerge "Send earlyBootEnded notice to all Keymasters" into rvc-dev am: be39b1d53e...
TreeHugger Robot [Wed, 1 Apr 2020 23:07:39 +0000 (23:07 +0000)]
Merge "Send earlyBootEnded notice to all Keymasters" into rvc-dev am: be39b1d53e am: 1735b4620d

Change-Id: Idf5044bc39dd897ff08fa2ea8fad34da10db63ca

4 years agoMerge "Send earlyBootEnded notice to all Keymasters" into rvc-dev am: be39b1d53e...
TreeHugger Robot [Wed, 1 Apr 2020 23:07:18 +0000 (23:07 +0000)]
Merge "Send earlyBootEnded notice to all Keymasters" into rvc-dev am: be39b1d53e am: ab75cad3ba

Change-Id: Ib4e8eef5a87ed2386573e79dde91360eeebb9f21

4 years agoMerge "Send earlyBootEnded notice to all Keymasters" into rvc-dev am: be39b1d53e
TreeHugger Robot [Wed, 1 Apr 2020 22:42:49 +0000 (22:42 +0000)]
Merge "Send earlyBootEnded notice to all Keymasters" into rvc-dev am: be39b1d53e

Change-Id: Ice2298726632bc0e6299669d5e56e6d5470bce5b

4 years agoMerge "Send earlyBootEnded notice to all Keymasters" into rvc-dev am: be39b1d53e
TreeHugger Robot [Wed, 1 Apr 2020 22:42:32 +0000 (22:42 +0000)]
Merge "Send earlyBootEnded notice to all Keymasters" into rvc-dev am: be39b1d53e

Change-Id: Ie48c8f230f88cab75c72594269adb1aed7529f3b

4 years agoMerge "Send earlyBootEnded notice to all Keymasters" into rvc-dev
TreeHugger Robot [Wed, 1 Apr 2020 22:31:35 +0000 (22:31 +0000)]
Merge "Send earlyBootEnded notice to all Keymasters" into rvc-dev

4 years agoSend earlyBootEnded notice to all Keymasters
Shawn Willden [Wed, 1 Apr 2020 16:02:16 +0000 (10:02 -0600)]
Send earlyBootEnded notice to all Keymasters

Vold incorrectly sends the earlyBootEnded signal only to the Keymaster
instance used for device encryption, but all of them need it.

Bug: 152932559
Test: VtsHalKeymasterV4_1TargetTest
Change-Id: Id8f01a1dc7d2398395f369c3ea74656a82888829

4 years agoChecking LOADER_USAGE_STATS before enabling read logs.
Alex Buynytskyy [Tue, 31 Mar 2020 21:46:25 +0000 (14:46 -0700)]
Checking LOADER_USAGE_STATS before enabling read logs.

Bug: b/152633648
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest
Change-Id: I29bf16d06a013566c8dd08e64be2a23ad805e37d