OSDN Git Service
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
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
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
Martijn Coenen [Fri, 17 Apr 2020 08:10:36 +0000 (08:10 +0000)]
Rename casefold/projectid properties. am:
aee6b6fccd
Change-Id: I43a490414c4bd816edb707ba350b4ee151133f8f
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
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
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
Martijn Coenen [Thu, 16 Apr 2020 08:21:00 +0000 (08:21 +0000)]
Merge "Rename casefold/projectid properties." am:
9d0508a854
Change-Id: If27cbdd3df8bb53b8e27a772be9b0826a8fce4e4
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
Martijn Coenen [Thu, 16 Apr 2020 08:06:53 +0000 (08:06 +0000)]
Merge "Rename 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
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
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
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
Jaegeuk Kim [Tue, 14 Apr 2020 16:09:24 +0000 (16:09 +0000)]
vold: support F2FS compression am:
f64d30aa82 am:
0770085201
Change-Id: I3bef3bef7704f7ef12a8774064ec1382fa4801d1
Jaegeuk Kim [Tue, 14 Apr 2020 15:58:32 +0000 (15:58 +0000)]
Merge changes from topic "fscompression" am:
7f4a71c2ff
Change-Id: I42086b7abde79ae1edb177f3668c73b1c7972295
Jaegeuk Kim [Tue, 14 Apr 2020 15:58:30 +0000 (15:58 +0000)]
vold: support F2FS compression am:
f64d30aa82
Change-Id: I03d6c574c922f08c67a662e483a1ed05ea7c4351
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
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
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
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
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
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
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
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
Treehugger Robot [Thu, 9 Apr 2020 22:07:40 +0000 (22:07 +0000)]
Merge "Send 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
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
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
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
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
TreeHugger Robot [Wed, 8 Apr 2020 00:10:59 +0000 (00:10 +0000)]
Merge "Choose options format using property" into rvc-dev
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
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
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
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
Paul Crowley [Tue, 7 Apr 2020 03:48:07 +0000 (03:48 +0000)]
Merge "Choose options format using property" am:
479588c68e
Change-Id: I67523617a54957da6a3fae7cd9233ff47627578d
Paul Crowley [Tue, 7 Apr 2020 03:23:57 +0000 (03:23 +0000)]
Merge "Choose 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
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
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
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
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
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
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>
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
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
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
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
Yurii Zubrytskyi [Fri, 3 Apr 2020 17:25:05 +0000 (17:25 +0000)]
Merge "[vold] update with incfs_ndk.h"
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Wed, 1 Apr 2020 22:31:35 +0000 (22:31 +0000)]
Merge "Send earlyBootEnded notice to all Keymasters" into rvc-dev
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
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
TreeHugger Robot [Tue, 31 Mar 2020 17:50:21 +0000 (17:50 +0000)]
Merge "Prefer f2fs for virtual (private) storage volumes." into rvc-dev am:
60d7c823ee am:
e52e4f2e1e
Change-Id: Ib4b3b1be427b7fac0fa0754d2d2c51162e7754ab
David Anderson [Tue, 31 Mar 2020 17:30:09 +0000 (17:30 +0000)]
[automerger skipped] Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously. am:
5ba8aeaa80 -s ours am:
87bf96a60e -s ours am:
8d6ada6fc8 -s ours
am skip reason: Change-Id Id8616804bba622226ca21b8eff0d3eb577b4b7e0 with SHA-1
5ba8aeaa80 is in history
Change-Id: I949eec911b63c5934e9d62df9159d2b937497959
Songchun Fan [Tue, 31 Mar 2020 14:25:13 +0000 (14:25 +0000)]
[vold] update with incfs_ndk.h am:
01c4e91c09 am:
48dd647aa7
Change-Id: I9c7f4c8e8a7a2238c49555e31eee8b7cb00b2b7d
TreeHugger Robot [Tue, 31 Mar 2020 13:55:07 +0000 (13:55 +0000)]
Merge "Prefer f2fs for virtual (private) storage volumes." into rvc-dev am:
60d7c823ee am:
dd9a9a417a
Change-Id: Iad32a8c315f598f782e33b0059261e27faaad199
TreeHugger Robot [Tue, 31 Mar 2020 11:12:23 +0000 (11:12 +0000)]
Merge "Prefer f2fs for virtual (private) storage volumes." into rvc-dev am:
60d7c823ee
Change-Id: Id0dc7498977c658b397f1e24e6f5f11a8b141ed3
TreeHugger Robot [Tue, 31 Mar 2020 11:11:49 +0000 (11:11 +0000)]
Merge "Prefer f2fs for virtual (private) storage volumes." into rvc-dev am:
60d7c823ee
Change-Id: Icf293e9f683a5a24c2c510c2201705c8c898fa88
TreeHugger Robot [Tue, 31 Mar 2020 11:00:31 +0000 (11:00 +0000)]
Merge "Prefer f2fs for virtual (private) storage volumes." into rvc-dev
David Anderson [Mon, 30 Mar 2020 18:27:29 +0000 (18:27 +0000)]
[automerger skipped] Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously. am:
5ba8aeaa80 -s ours am:
87bf96a60e -s ours am:
459685a077 -s ours
am skip reason: Change-Id Id8616804bba622226ca21b8eff0d3eb577b4b7e0 with SHA-1
1dd5c4f787 is in history
Change-Id: Id7682b7fc97ee5871bd5c1d806747ee3f868209c
Songchun Fan [Mon, 30 Mar 2020 18:07:29 +0000 (18:07 +0000)]
[vold] update with incfs_ndk.h am:
01c4e91c09 am:
c0aaacbd28
Change-Id: I62a75cf45950f4bfbbb0534a52de642453977e28
David Anderson [Mon, 30 Mar 2020 09:12:14 +0000 (09:12 +0000)]
[automerger skipped] Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously. am:
5ba8aeaa80 -s ours am:
87bf96a60e -s ours
am skip reason: Change-Id Id8616804bba622226ca21b8eff0d3eb577b4b7e0 with SHA-1
1dd5c4f787 is in history
Change-Id: If44408e84cabcadf9b3c7058375df4c5d976607e
David Anderson [Mon, 30 Mar 2020 09:12:02 +0000 (09:12 +0000)]
[automerger skipped] Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously. am:
5ba8aeaa80 -s ours am:
87bf96a60e -s ours
am skip reason: Change-Id Id8616804bba622226ca21b8eff0d3eb577b4b7e0 with SHA-1
1dd5c4f787 is in history
Change-Id: If9bb43422e10f5c5053f00191b1f1dcec1718aea
David Anderson [Mon, 30 Mar 2020 09:00:10 +0000 (09:00 +0000)]
[automerger skipped] Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously. am:
5ba8aeaa80 -s ours
am skip reason: Change-Id Id8616804bba622226ca21b8eff0d3eb577b4b7e0 with SHA-1
1dd5c4f787 is in history
Change-Id: I30e748f7983e661ba2abd9bbd2ec12dc453b1eb1
David Anderson [Mon, 30 Mar 2020 09:00:04 +0000 (09:00 +0000)]
[automerger skipped] Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously. am:
5ba8aeaa80 -s ours
am skip reason: Change-Id Id8616804bba622226ca21b8eff0d3eb577b4b7e0 with SHA-1
1dd5c4f787 is in history
Change-Id: Iaffd50d7b736066cfa429edf28b3f18fb956715d
Songchun Fan [Sun, 29 Mar 2020 17:15:03 +0000 (17:15 +0000)]
[vold] update with incfs_ndk.h am:
01c4e91c09
Change-Id: I3c917640ee14bdafeb012ca1ff59cab6c399d8a9
Songchun Fan [Sun, 29 Mar 2020 17:15:00 +0000 (17:15 +0000)]
[vold] update with incfs_ndk.h am:
01c4e91c09
Change-Id: I70d5449b42f1126885582b701bc45d9a501514e8
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
David Anderson [Tue, 11 Jun 2019 21:51:25 +0000 (14:51 -0700)]
Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously.
Bug:
134711825
Bug:
149462396
Test: StorageManagerTest
Change-Id: Id8616804bba622226ca21b8eff0d3eb577b4b7e0
Merged-In: Id8616804bba622226ca21b8eff0d3eb577b4b7e0
Yurii Zubrytskyi [Thu, 26 Mar 2020 08:09:05 +0000 (08:09 +0000)]
[automerger skipped] Merge changes from topic "merge-incremental-vold" am:
10a372f1d2 am:
41c1c40afc -s ours am:
100553416a -s ours
am skip reason: Change-Id I03a8cab0dd6abd7d5c9dcbbc2acb651e818e6cd8 with SHA-1
131365a3e5 is in history
Change-Id: I2a6b7b5398163aaa6c262d1a6117c605e0c49a91
Yurii Zubrytskyi [Thu, 26 Mar 2020 08:09:04 +0000 (08:09 +0000)]
[automerger skipped] Expose new IncFS interface through Vold am:
d05bcc8070 am:
636da65360 -s ours am:
7867b1299c -s ours
am skip reason: Change-Id I09b33a34ff1ac7f6e415b7bd090c22e7df24d72d with SHA-1
3497cb5be5 is in history
Change-Id: Idc9f9d8236d3a19826ac4eec845d83df1f33a18e
Yurii Zubrytskyi [Thu, 26 Mar 2020 07:59:46 +0000 (07:59 +0000)]
Merge changes from topic "merge-incremental-vold" am:
10a372f1d2 am:
41c1c40afc
Change-Id: I542b7a48e7d94b78bf3fb01e44263e2b161df60f
Yurii Zubrytskyi [Thu, 26 Mar 2020 07:59:44 +0000 (07:59 +0000)]
Expose new IncFS interface through Vold am:
d05bcc8070 am:
636da65360
Change-Id: I349002a3eb80d962c86b24f89816c4ce76d5d65e
Yurii Zubrytskyi [Thu, 26 Mar 2020 07:55:47 +0000 (07:55 +0000)]
[automerger skipped] Merge changes from topic "merge-incremental-vold" am:
10a372f1d2 am:
41c1c40afc -s ours
am skip reason: Change-Id I03a8cab0dd6abd7d5c9dcbbc2acb651e818e6cd8 with SHA-1
131365a3e5 is in history
Change-Id: Ic73870d77b44d60bd7bdcbb44ca43267fd456945
Yurii Zubrytskyi [Thu, 26 Mar 2020 07:55:45 +0000 (07:55 +0000)]
[automerger skipped] Expose new IncFS interface through Vold am:
d05bcc8070 am:
636da65360 -s ours
am skip reason: Change-Id I09b33a34ff1ac7f6e415b7bd090c22e7df24d72d with SHA-1
3497cb5be5 is in history
Change-Id: I71e68b76895658e5546f7c96678905b249ff8ffc
Yurii Zubrytskyi [Thu, 26 Mar 2020 07:33:58 +0000 (07:33 +0000)]
Merge changes from topic "merge-incremental-vold" am:
10a372f1d2
Change-Id: Id6fe791310761aa715fdf0e37760052a1534a4f0
Yurii Zubrytskyi [Thu, 26 Mar 2020 07:33:56 +0000 (07:33 +0000)]
Expose new IncFS interface through Vold am:
d05bcc8070
Change-Id: Icbdb9f233850e70e8ca7c458fd30c4bea93a9923
Yurii Zubrytskyi [Thu, 26 Mar 2020 07:23:11 +0000 (07:23 +0000)]
Merge changes from topic "merge-incremental-vold"
* changes:
[vold] Add argument verification to IncFS methods
Expose new IncFS interface through Vold
Yurii Zubrytskyi [Thu, 26 Mar 2020 04:36:54 +0000 (04:36 +0000)]
[vold] Add argument verification to IncFS methods am:
131365a3e5 am:
ae78344623
Change-Id: Ied64735b708a77a8e37007495e4d880e3ca677eb
Yurii Zubrytskyi [Thu, 26 Mar 2020 04:36:43 +0000 (04:36 +0000)]
[vold] Add argument verification to IncFS methods am:
131365a3e5 am:
8a24abaabe
Change-Id: I11d2947b5968defd1f364b3c4e6bf80459c24352
Yurii Zubrytskyi [Thu, 26 Mar 2020 04:25:24 +0000 (04:25 +0000)]
[vold] Add argument verification to IncFS methods am:
131365a3e5
Change-Id: I8a19bea4ca9c8f30f754cf7d43feba432152e204
Yurii Zubrytskyi [Thu, 26 Mar 2020 04:25:16 +0000 (04:25 +0000)]
[vold] Add argument verification to IncFS methods am:
131365a3e5
Change-Id: I149dfdef094804c5eeaa928ee841f7fd7a5f228f
Yurii Zubrytskyi [Tue, 24 Mar 2020 23:23:51 +0000 (16:23 -0700)]
[vold] Add argument verification to IncFS methods
+ Get rid of an extra string copy in path validation function
Bug:
152349257
Test: atest vold_tests
Change-Id: I03a8cab0dd6abd7d5c9dcbbc2acb651e818e6cd8
Merged-In: I03a8cab0dd6abd7d5c9dcbbc2acb651e818e6cd8
OSDN Git Service
