diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-21 15:53:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-21 15:53:32 +0000 |
| commit | 6bcd65c99e5d12159617a7ea1c0f1feff93cf7b8 (patch) | |
| tree | cce172589256209b9cf4013fb5798310eda12512 /keystore/java | |
| parent | d42f1be8eb2b9eb1e121497591bb71480d996ca9 (diff) | |
| parent | 52e19940b16884d375ee8169444e8878b1a07ce0 (diff) | |
Merge "Keystore 2.0: Add namespace locksettings."
Diffstat (limited to 'keystore/java')
| -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 */ |