commit 55381c7e36953e722f73e8f001c86650d12df0dc
author Treehugger Robot <treehugger-gerrit@google.com> Tue Feb 09 00:33:48 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 09 00:33:48 2021 +0000
tree d2a0a9106972b1fb0abd1c64735ccae729e839c8
parent de483bef10a850f31c27edaa9d4f9a5fa82cfce1
parent ec18e4dfebf28a2e761e809c78df80d9830c6662

Merge changes I1bc496ec,I917afe34,If50eedf4,Ie002eb18

* changes:
  Keystore 2.0: Handle Keystore enforceable enforcement parameters.
  Keystore 2.0 legacy wrapper: Fix best padding candidate lookup.
  Keystore 2.0: Add error logging.
  Keystore 2.0: Filter tags on key generation and import.

keystore2/keystore2.rc

diff --git a/keystore2/keystore2.rc b/keystore2/keystore2.rc
index bc040e5..c5fc72a 100644
--- a/keystore2/keystore2.rc
+++ b/keystore2/keystore2.rc
@@ -8,7 +8,7 @@
 
 # Start Keystore 2 conditionally
 # TODO b/171563717 Remove when Keystore 2 migration is complete.
-on nonencrypted && property:ro.android.security.keystore2.enable=true
+on nonencrypted && property:persist.android.security.keystore2.enable=true
     enable keystore2
 
 service keystore2 /system/bin/keystore2 /data/misc/keystore