diff options
author | Janis Danisevskis <jdanis@google.com> | 2021-04-15 09:32:16 -0700 |
---|---|---|
committer | Janis Danisevskis <jdanis@google.com> | 2021-04-20 15:32:56 +0000 |
commit | 52e19940b16884d375ee8169444e8878b1a07ce0 (patch) | |
tree | 2910636114bd3d2933873a0aa77050c81ae94c3f /keystore | |
parent | cbe7e963ab96d4fdaf91124f420f73dccc97ee51 (diff) |
Keystore 2.0: Add namespace locksettings.
This namespace is required by LocksettingsService to protect the
synthetic password key from removal when the user removes the
credentials or wipes AID_SYSTEM app data.
Bug: 184664830
Test: N/A
Change-Id: Ie752a75d2cb2ebf1f4e5814bc2cbc807cc754c21
Diffstat (limited to 'keystore')
-rw-r--r-- | keystore/java/android/security/keystore/KeyProperties.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/keystore/java/android/security/keystore/KeyProperties.java b/keystore/java/android/security/keystore/KeyProperties.java index 682d12a65ea3..d9a7994d6c4a 100644 --- a/keystore/java/android/security/keystore/KeyProperties.java +++ b/keystore/java/android/security/keystore/KeyProperties.java @@ -904,6 +904,7 @@ public abstract class KeyProperties { @IntDef(prefix = { "NAMESPACE_" }, value = { NAMESPACE_APPLICATION, NAMESPACE_WIFI, + NAMESPACE_LOCKSETTINGS, }) public @interface Namespace {} @@ -925,6 +926,13 @@ public abstract class KeyProperties { public static final int NAMESPACE_WIFI = 102; /** + * The namespace identifier for the LOCKSETTINGS Keystore namespace. + * This must be kept in sync with system/sepolicy/private/keystore2_key_contexts + * @hide + */ + public static final int NAMESPACE_LOCKSETTINGS = 103; + + /** * For legacy support, translate namespaces into known UIDs. * @hide */ |