Commit graph

5146 commits

Author SHA1 Message Date
Treehugger Robot
85705f6c86 Merge "Remove ndk_platform backend. Use the ndk backend." 2021-07-28 12:26:13 +00:00
Nikita Ioffe
5f7169f837 Merge "Remove vold logs related to block devices" am: cbf82ffa29 am: 9bf8553f8d am: 78c9cba6a5
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1779986

Change-Id: Icb801043c40ade324bbc7bcd78b31992d1e2bcda
2021-07-28 11:38:48 +00:00
Nikita Ioffe
78c9cba6a5 Merge "Remove vold logs related to block devices" am: cbf82ffa29 am: 9bf8553f8d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1779986

Change-Id: I0f5f606384ccebf21e618617a2dd7e12cc4db7b6
2021-07-28 11:26:30 +00:00
Nikita Ioffe
9bf8553f8d Merge "Remove vold logs related to block devices" am: cbf82ffa29
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1779986

Change-Id: I81accecbb47c158de761df31fe078aaa27332006
2021-07-28 11:15:08 +00:00
Nikita Ioffe
cbf82ffa29 Merge "Remove vold logs related to block devices" 2021-07-28 11:01:01 +00:00
Nikita Ioffe
b881fc4feb Remove vold logs related to block devices
Since every APEX requires at least one loop device, now most of the
block devices on a device are not managed by vold. This change removes
some log statements around block devices that vold is not aware of.

Test: device boots
Test: adb logcat
Change-Id: I8efa22023c1f888e75f40178fac464af4457df3c
2021-07-28 02:58:57 +01:00
Jiyong Park
973e05938d Remove ndk_platform backend. Use the ndk backend.
The ndk_platform backend will soon be deprecated because the ndk backend
can serve the same purpose. This is to eliminate the confusion about
having two variants (ndk and ndk_platform) for the same 'ndk' backend.

Bug: 161456198
Test: m
Change-Id: I87554ce86da0f862568c5aa84a21e6613655eb25
2021-07-27 12:21:11 +09:00
Sean Keys
9eedaed41e [automerger skipped] Add command for setting the key binding seed am: c11f7de95d -s ours
am skip reason: Merged-In I2e16387b0752a30ef226b5ddf32ebf955aa9610a with SHA-1 8452f41d4a is already in history

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

Change-Id: Ib0021f48f0bcb84d374976aaf3537dc69a1523c0
2021-07-22 00:40:10 +00:00
Sean Keys
c11f7de95d Add command for setting the key binding seed
The seed value is passed to vold early in startup so that the
key-encryption keys are bound to the seed. This is useful for systems
like auto, in which the Android device may not require credentials to
use. In that case, the device should be bound to the rest of the system
(the car, in the case of auto) to guard against theft.

cherry-pick: aosp/1757970

Test: manual
Bug: 157501579
Change-Id: I2e16387b0752a30ef226b5ddf32ebf955aa9610a
Merged-In: I2e16387b0752a30ef226b5ddf32ebf955aa9610a
2021-07-16 17:17:06 +00:00
Keith Mok
879038b619 Merge "Add command for setting the key binding seed" am: 2d76731968 am: 7aec273c8d am: a3f7a54366
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1757970

Change-Id: Ic650b8d63d1865f9db8900424243257e60cc2a66
2021-07-15 21:45:56 +00:00
Keith Mok
a3f7a54366 Merge "Add command for setting the key binding seed" am: 2d76731968 am: 7aec273c8d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1757970

Change-Id: If53ae63a91b702e09297c1d916394aee99eee8d2
2021-07-15 21:35:55 +00:00
Keith Mok
7aec273c8d Merge "Add command for setting the key binding seed" am: 2d76731968
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1757970

Change-Id: I4fe8e883754c0c8322fb8223cdb64904da516972
2021-07-15 21:26:35 +00:00
Keith Mok
2d76731968 Merge "Add command for setting the key binding seed" 2021-07-15 20:47:42 +00:00
Sean Keys
8452f41d4a Add command for setting the key binding seed
The seed value is passed to vold early in startup so that the
key-encryption keys are bound to the seed. This is useful for systems
like auto, in which the Android device may not require credentials to
use. In that case, the device should be bound to the rest of the system
(the car, in the case of auto) to guard against theft.

Test: manual
Change-Id: I2e16387b0752a30ef226b5ddf32ebf955aa9610a
2021-07-13 23:41:50 +00:00
Eric Biggers
ea24b870d2 [automerger skipped] Ignore too-early earlyBootEnded on FDE devices am: 2ddc1338d7 am: 0b26eb0701 -s ours
am skip reason: Merged-In I03f816db194a8276ad19ca99b3c8894e8a5fed23 with SHA-1 2ddc1338d7 is already in history

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

Change-Id: I6387b2f8cf00f891526e37452e0b1be3bedb7b28
2021-06-25 21:25:20 +00:00
Eric Biggers
3777a77b5d [automerger skipped] Ignore too-early earlyBootEnded on FDE devices am: 2ddc1338d7 -s ours am: 3746f5a475 -s ours
am skip reason: Merged-In I03f816db194a8276ad19ca99b3c8894e8a5fed23 with SHA-1 4859e0ca0f is already in history

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

Change-Id: I811d7dc821399a6be5b23e7940dc055b9bf1a05c
2021-06-25 21:19:25 +00:00
Eric Biggers
0b26eb0701 Ignore too-early earlyBootEnded on FDE devices am: 2ddc1338d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15109082

Change-Id: I23c01e02082020de396bc34b2846def0bb9c14d4
2021-06-25 21:07:46 +00:00
Eric Biggers
3746f5a475 [automerger skipped] Ignore too-early earlyBootEnded on FDE devices am: 2ddc1338d7 -s ours
am skip reason: Merged-In I03f816db194a8276ad19ca99b3c8894e8a5fed23 with SHA-1 4859e0ca0f is already in history

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

Change-Id: I0f1cde2384d1848bd4c5da8764dc5a350a56b1bd
2021-06-25 21:06:58 +00:00
Eric Biggers
4a45367679 Merge "Ignore too-early earlyBootEnded on FDE devices" am: a3bd31c170 am: 979429e6c3 am: 9f749bcb19
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1747633

Change-Id: I9b3df8ebb2a678fc5c865146f66014343c5a0515
2021-06-25 20:24:47 +00:00
Eric Biggers
9f749bcb19 Merge "Ignore too-early earlyBootEnded on FDE devices" am: a3bd31c170 am: 979429e6c3
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1747633

Change-Id: Iff37e24d06efedebf682c37b79fdc8ec868b0739
2021-06-25 20:11:40 +00:00
Eric Biggers
979429e6c3 Merge "Ignore too-early earlyBootEnded on FDE devices" am: a3bd31c170
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1747633

Change-Id: Ida62bd5cdab40ce459ba45d20a13c09545b4d938
2021-06-25 19:57:37 +00:00
Eric Biggers
2ddc1338d7 Ignore too-early earlyBootEnded on FDE devices
Don't call IKeystoreMaintenance::earlyBootEnded() too early on FDE
devices, so that keystore2 doesn't have to be restarted.

Bug: 192090857
Test: Tested FDE on Cuttlefish, both first and non-first boots.
      Verified via log that earlyBootEnded is now called only when it
      should be, and that keystore2 no longer has to be restarted.
Change-Id: I03f816db194a8276ad19ca99b3c8894e8a5fed23
(cherry picked from commit 4859e0ca0f)
Merged-In: I03f816db194a8276ad19ca99b3c8894e8a5fed23
2021-06-25 12:44:08 -07:00
Eric Biggers
a3bd31c170 Merge "Ignore too-early earlyBootEnded on FDE devices" 2021-06-25 19:43:02 +00:00
Eric Biggers
4859e0ca0f Ignore too-early earlyBootEnded on FDE devices
Don't call IKeystoreMaintenance::earlyBootEnded() too early on FDE
devices, so that keystore2 doesn't have to be restarted.

Bug: 192090857
Test: Tested FDE on Cuttlefish, both first and non-first boots.
      Verified via log that earlyBootEnded is now called only when it
      should be, and that keystore2 no longer has to be restarted.
Change-Id: I03f816db194a8276ad19ca99b3c8894e8a5fed23
2021-06-25 12:40:21 -07:00
Treehugger Robot
eef934fa9e Merge "Replace writepid with task_profiles command for cgroup migration" am: 73a54f653b am: 545957abfe am: 7bff55552f
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1740142

Change-Id: Ic110670412331e5d8f9100c890367243823b0b4d
2021-06-23 22:17:08 +00:00
Treehugger Robot
7bff55552f Merge "Replace writepid with task_profiles command for cgroup migration" am: 73a54f653b am: 545957abfe
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1740142

Change-Id: Iedea33f82eb260baa60fdb65bc6de3b849e0c579
2021-06-23 22:03:08 +00:00
Treehugger Robot
545957abfe Merge "Replace writepid with task_profiles command for cgroup migration" am: 73a54f653b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1740142

Change-Id: I323edcd23a26ffdef59a45e9cd19574c19514ce1
2021-06-23 21:51:39 +00:00
Treehugger Robot
73a54f653b Merge "Replace writepid with task_profiles command for cgroup migration" 2021-06-23 21:32:20 +00:00
Suren Baghdasaryan
d7d3010c45 Replace writepid with task_profiles command for cgroup migration
writepid command usage to join a cgroup has been deprecated in favor
of a more flexible approach using task_profiles. This way cgroup path
is not hardcoded and cgroup changes can be easily made. Replace
writepid with task_profiles command to migrate between cgroups.

Bug: 191283136
Test: build and boot
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I9e89fc0f3dc1b4e970cf3a5982ed7f177d2c392c
2021-06-23 18:40:55 +00:00
Paul Crowley
1c33372856 Merge "Remove wait_for_keymaster and all references" am: a236ff87b9 am: f267642932 am: 8b6b626be7
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1736579

Change-Id: I1ea34e82df2893e31de97ba1267aa52a7dda91b0
2021-06-17 19:04:06 +00:00
Paul Crowley
8b6b626be7 Merge "Remove wait_for_keymaster and all references" am: a236ff87b9 am: f267642932
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1736579

Change-Id: If6bbdf4c3ae08f8d372afbd635353b47c131fbdd
2021-06-17 18:58:11 +00:00
Paul Crowley
f267642932 Merge "Remove wait_for_keymaster and all references" am: a236ff87b9
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1736579

Change-Id: I163f07ec1d3f62423d233da7bf225579f9d0894f
2021-06-17 18:40:40 +00:00
Paul Crowley
a236ff87b9 Merge "Remove wait_for_keymaster and all references" 2021-06-17 18:18:28 +00:00
Treehugger Robot
619bfa14fa Merge "No using inside header files" am: 17e1a0919d am: 23aaf5a7a6 am: a1c6ce6f2f
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1285212

Change-Id: Ieaf8c96378dfdf20ce21648c0fb6ae9e39ce4260
2021-06-16 10:41:30 +00:00
Treehugger Robot
a1c6ce6f2f Merge "No using inside header files" am: 17e1a0919d am: 23aaf5a7a6
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1285212

Change-Id: I9299b2f0762c02dae28b4dad8a6ee67fd03ad1a1
2021-06-16 10:31:29 +00:00
Treehugger Robot
23aaf5a7a6 Merge "No using inside header files" am: 17e1a0919d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1285212

Change-Id: Ifb5136466ac04777988d14e3db63578a66384d29
2021-06-16 10:14:44 +00:00
Treehugger Robot
17e1a0919d Merge "No using inside header files" 2021-06-16 09:56:52 +00:00
Paul Crowley
604abdd0cb Remove wait_for_keymaster and all references
No longer needed now init listens for property changes on a
separate thread.

Bug: 186580823
Test: Cuttlefish boots successfully
Change-Id: I7dd1f85a73df6c2160ef8778703709e90309b9b4
2021-06-15 15:54:51 -07:00
Eric Biggers
ef466e905e Merge "Replace most references to Keymaster with Keystore" am: ec78a94586 am: 087a2952db am: 23638cfcb3
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1737853

Change-Id: Iab08102098f80f2211f9b24e2e9b8b6a384f8ced
2021-06-15 22:34:59 +00:00
Paul Crowley
f4430387d2 No using inside header files
I thought it was OK to use "using" in a header file so long as it was
inside a "namespace" block, but it just imports symbols from one
namespace into another, so things that shouldn't work do.

Test: Treehugger
Change-Id: I4d43d35339636af7e95761cada7120b4db638c01
2021-06-15 15:20:44 -07:00
Eric Biggers
23638cfcb3 Merge "Replace most references to Keymaster with Keystore" am: ec78a94586 am: 087a2952db
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1737853

Change-Id: Ic1b3d004e7d999e934cf47f987899c4ab378c12e
2021-06-15 22:10:10 +00:00
Eric Biggers
087a2952db Merge "Replace most references to Keymaster with Keystore" am: ec78a94586
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1737853

Change-Id: Ic27ef7ebf2817da0a1a302ae77186ce3973368a1
2021-06-15 21:50:06 +00:00
Eric Biggers
ec78a94586 Merge "Replace most references to Keymaster with Keystore" 2021-06-15 21:35:16 +00:00
Eric Biggers
d86a8abec7 Replace most references to Keymaster with Keystore
Now that vold uses Keystore2 rather than the Keymaster HAL directly, and
also the new version of Keymaster is called "KeyMint" instead, replace
most of the references to Keymaster in vold with Keystore.

(I decided not to include the "2" in most places, as it seemed
unnecessarily precise in most places, and it would be something that
might need to keep being updated.  Only Keystore.{cpp,h} really need to
care about the version number.)

I didn't rename many things in cryptfs.cpp, as that file will be going
away soon anyway.  I also left "wait_for_keymaster" and "vdc keymaster
earlyBootEnded" as-is for now, as those are referenced outside vold.

Bug: 183669495
Change-Id: I92cd648fae09f8c9769f7cf34dbf6c6e956be4e8
2021-06-15 12:07:15 -07:00
Eric Biggers
68361c3bdb Merge "cryptfs: log beginning/end of each unmount attempt" am: e33bd41f49 am: d535dc6846 am: 148960c4da
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1735012

Change-Id: I32d1255579ddcdff82871916dfefff1e72fe8afb
2021-06-14 22:42:03 +00:00
Eric Biggers
148960c4da Merge "cryptfs: log beginning/end of each unmount attempt" am: e33bd41f49 am: d535dc6846
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1735012

Change-Id: I6ae1f131ef7b29dc220531dfc619e846c704fb1e
2021-06-14 22:27:49 +00:00
Eric Biggers
d535dc6846 Merge "cryptfs: log beginning/end of each unmount attempt" am: e33bd41f49
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1735012

Change-Id: Id6caea9e59a5b65a594c3545ca8d3e90a0558a7c
2021-06-14 22:15:18 +00:00
Eric Biggers
e33bd41f49 Merge "cryptfs: log beginning/end of each unmount attempt" 2021-06-14 22:00:00 +00:00
Xin Li
673016129a [automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: 12e48a85fb am: 35c828e5ae am: 640c6943a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I842ba6c219a4ea07646591c52f92333c2d0265c4
2021-06-14 03:47:46 +00:00
Xin Li
c8678f8ce5 [automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 1c79e144d5 am: 0bd6aa1328 am: a63ab5e7e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ied712d4cca18855f49241ff5125cf05322177d04
2021-06-14 03:47:37 +00:00