Merge "Keystore 2.0: Start keystore2 daemon conditionally." am: e0b6606138

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1472235

Change-Id: Ic5089402799d4479c8fdbb35a68b8fc8196a931e
This commit is contained in:
Treehugger Robot 2020-10-25 21:03:31 +00:00 committed by Automerger Merge Worker
commit 4e3244236f

View file

@ -5,8 +5,16 @@
# Keystore shall run as user keystore and groups keystore, readproc, and log.
#
# See system/core/init/README.md for information on the init.rc language.
# Start Keystore 2 conditionally
# TODO b/171563717 Remove when Keystore 2 migration is complete.
on nonencrypted && property:ro.android.security.keystore2.enable=true
enable keystore2
service keystore2 /system/bin/keystore2 /data/misc/keystore
class main
user keystore
group keystore readproc log
writepid /dev/cpuset/foreground/tasks
# TODO b/171563717 Remove when Keystore 2 migration is complete.
disabled