Commit graph

3937 commits

Author SHA1 Message Date
Martijn Coenen
d3cf750908 [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
2020-04-17 08:24:22 +00:00
Martijn Coenen
d8c80b809d [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
2020-04-17 08:24:13 +00:00
Martijn Coenen
f417e12e56 Rename casefold/projectid properties. am: aee6b6fccd
Change-Id: I43a490414c4bd816edb707ba350b4ee151133f8f
2020-04-17 08:10:36 +00:00
Martijn Coenen
d4de3bd143 [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
2020-04-17 08:10:15 +00:00
Martijn Coenen
661e87186b Merge "Rename casefold/projectid properties." am: 9d0508a854 am: 5901d6f492 am: 729c26033e
Change-Id: Ib6e0fea59e67396bd6b3e88d18e20b88cf17aac8
2020-04-16 08:59:27 +00:00
Martijn Coenen
729c26033e Merge "Rename casefold/projectid properties." am: 9d0508a854 am: 5901d6f492
Change-Id: Ic9982c15351008ff686f9bf395ae8f3b4adcdb30
2020-04-16 08:35:08 +00:00
Martijn Coenen
5901d6f492 Merge "Rename casefold/projectid properties." am: 9d0508a854
Change-Id: If27cbdd3df8bb53b8e27a772be9b0826a8fce4e4
2020-04-16 08:21:00 +00:00
Martijn Coenen
e9239f757e Rename casefold/projectid properties (for f2fs).
According to property naming guidelines.

Bug: 152170470
Bug: 153525566
Test: N/A
Change-Id: Iad1caff6e5cfb7f6a09b77532d64a24de9b0b3c6
2020-04-16 10:18:36 +02:00
Martijn Coenen
aee6b6fccd Rename casefold/projectid properties.
According to property naming guidelines.

Bug: 152170470
Bug: 153525566
Test: N/A
Change-Id: Iaebff2a835288839a2faf0edbe0e47ceb96b4458
Merged-In: Iaebff2a835288839a2faf0edbe0e47ceb96b4458
2020-04-16 10:18:30 +02:00
Martijn Coenen
9d0508a854 Merge "Rename casefold/projectid properties." 2020-04-16 08:06:53 +00:00
Martijn Coenen
97ff0845e2 Rename casefold/projectid properties.
According to property naming guidelines.

Bug: 152170470
Bug: 153525566
Test: N/A
Change-Id: Iaebff2a835288839a2faf0edbe0e47ceb96b4458
2020-04-15 17:29:21 +02:00
Jaegeuk Kim
a0fbc5cee0 Merge changes from topic "fscompression" am: 7f4a71c2ff am: 0f5df6477d am: 564f7e7713
Change-Id: Idde972ed6fbaa53b0b8b767f184c96562e57459e
2020-04-14 16:38:23 +00:00
Jaegeuk Kim
977c658b8f vold: support F2FS compression am: f64d30aa82 am: 0770085201 am: d6cf8998e2
Change-Id: Iefddee319311b25fbe3f60ed4f1669e4cca16569
2020-04-14 16:38:21 +00:00
Jaegeuk Kim
564f7e7713 Merge changes from topic "fscompression" am: 7f4a71c2ff am: 0f5df6477d
Change-Id: I3b1d5956b6c3783b14b203c1d6d234d6b97667f7
2020-04-14 16:09:28 +00:00
Jaegeuk Kim
d6cf8998e2 vold: support F2FS compression am: f64d30aa82 am: 0770085201
Change-Id: I3bef3bef7704f7ef12a8774064ec1382fa4801d1
2020-04-14 16:09:24 +00:00
Jaegeuk Kim
0f5df6477d Merge changes from topic "fscompression" am: 7f4a71c2ff
Change-Id: I42086b7abde79ae1edb177f3668c73b1c7972295
2020-04-14 15:58:32 +00:00
Jaegeuk Kim
0770085201 vold: support F2FS compression am: f64d30aa82
Change-Id: I03d6c574c922f08c67a662e483a1ed05ea7c4351
2020-04-14 15:58:30 +00:00
Jaegeuk Kim
7f4a71c2ff Merge changes from topic "fscompression"
* changes:
  vold: clean up configuration set
  vold: support F2FS compression
2020-04-14 15:54:18 +00:00
Jaegeuk Kim
c52f6724ed 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
2020-04-13 13:14:14 -07:00
Xin Li
ccfea68a65 [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
2020-04-10 03:29:49 +00:00
Xin Li
64a17820a5 [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
2020-04-10 03:08:48 +00:00
Xin Li
b4a3c55026 DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master
Bug: 151763422
Change-Id: I04b8a113f3194fc4de80da1f4c0f9551115e6529
2020-04-09 17:51:30 -07:00
Treehugger Robot
686180bf6d [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
2020-04-09 23:15:40 +00:00
Treehugger Robot
6a11ad41dd [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
2020-04-09 22:52:28 +00:00
Treehugger Robot
483de9f5fd Merge "Send earlyBootEnded notice to all Keymasters" am: 0e9fbe4a3e
Change-Id: Ia8f5e55336e3a4d0a71d353b2f28553cf6196bd6
2020-04-09 22:31:09 +00:00
Treehugger Robot
0e9fbe4a3e Merge "Send earlyBootEnded notice to all Keymasters" 2020-04-09 22:07:40 +00:00
Shawn Willden
28eddbd2ef 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
2020-04-09 15:22:43 -06:00
TreeHugger Robot
2a2dc76b9e [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
2020-04-08 00:37:21 +00:00
TreeHugger Robot
3dcb413e82 [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
2020-04-08 00:37:07 +00:00
TreeHugger Robot
a46dc6fe7a Merge "Choose options format using property" into rvc-dev am: 0fbd0c1542
Change-Id: I2d891dd6a28c8f599b68a5df840d0d331fc1c440
2020-04-08 00:24:40 +00:00
TreeHugger Robot
1ece05143d [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
2020-04-08 00:24:33 +00:00
TreeHugger Robot
0fbd0c1542 Merge "Choose options format using property" into rvc-dev 2020-04-08 00:10:59 +00:00
Paul Crowley
4073c0b524 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: f56d553bab
Merged-In: Ib51071b7c316ce074de72439741087b18335048c
Change-Id: Ib51071b7c316ce074de72439741087b18335048c
2020-04-07 07:35:16 -07:00
Paul Crowley
2be8863497 Merge "Choose options format using property" am: 479588c68e am: 30c1b0225e am: 7f076f9142
Change-Id: I5e91aeeee4a64704ffe9ad5a425e91065e18d8e2
2020-04-07 04:29:39 +00:00
Paul Crowley
cd5936e264 Merge "Choose options format using property" am: 479588c68e am: 30c1b0225e
Change-Id: Id82ce73849059e7792422023afc66cba13833ecc
2020-04-07 04:08:32 +00:00
Paul Crowley
7f076f9142 Merge "Choose options format using property" am: 479588c68e am: 30c1b0225e
Change-Id: Ic6b4c8e252ea9f3285c0646c7ed26d0bb54a2a88
2020-04-07 04:07:38 +00:00
Paul Crowley
30c1b0225e Merge "Choose options format using property" am: 479588c68e
Change-Id: I67523617a54957da6a3fae7cd9233ff47627578d
2020-04-07 03:48:07 +00:00
Paul Crowley
479588c68e Merge "Choose options format using property" 2020-04-07 03:23:57 +00:00
Paul Crowley
f56d553bab 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
2020-04-06 08:45:32 -07:00
Alex Buynytskyy
3343b85a96 Additional operation check when enabling read logs. am: 605a44fe93 am: fb9001b917
Change-Id: Icdeed4b0ebb5a8d0a6bbaa1a84159d7b4f3e0518
2020-04-04 04:11:32 +00:00
Alex Buynytskyy
c5494023ed Additional operation check when enabling read logs. am: 605a44fe93 am: 5cbdc3153c
Change-Id: I7784c336f6a59d46297e2adc1d5df7b1bf8d7b89
2020-04-04 04:11:23 +00:00
Alex Buynytskyy
fb9001b917 Additional operation check when enabling read logs. am: 605a44fe93
Change-Id: Ie068daae873a7796873e4170cd18617d8161916f
2020-04-04 04:08:57 +00:00
Alex Buynytskyy
5cbdc3153c Additional operation check when enabling read logs. am: 605a44fe93
Change-Id: I6b91438709189302d4afe64d3d5dfe28fadd513d
2020-04-04 04:08:31 +00:00
Alex Buynytskyy
605a44fe93 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
2020-04-03 18:42:04 -07:00
Jaegeuk Kim
f64d30aa82 vold: support F2FS compression
Bug: 134580167
Change-Id: Iadd001dc5ce0f91a4337f5b27ea8cc54f9760b0d
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2020-04-03 14:02:14 -07:00
Yurii Zubrytskyi
5a2f285884 [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
2020-04-03 18:29:35 +00:00
Yurii Zubrytskyi
0c0ed9d6b5 Merge "[vold] update with incfs_ndk.h" am: 29ee196fb5 am: e296f9cbf6
Change-Id: I0173898669ca7d4b3a03449d2488f69cddb0ba3f
2020-04-03 18:10:50 +00:00
Yurii Zubrytskyi
16548b2538 [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
2020-04-03 18:09:40 +00:00
Yurii Zubrytskyi
e296f9cbf6 Merge "[vold] update with incfs_ndk.h" am: 29ee196fb5
Change-Id: If51dfb7c76c6593ecf31c2b42712c4ac114d2b83
2020-04-03 17:49:01 +00:00
Yurii Zubrytskyi
29ee196fb5 Merge "[vold] update with incfs_ndk.h" 2020-04-03 17:25:05 +00:00