diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-21 17:02:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-21 17:02:29 +0000 |
| commit | 9271023eeda3d9d1953cf524f59bf5de34f66ace (patch) | |
| tree | c4a07eafad11816e340e935a0b6610e77f0eba36 /keystore | |
| parent | 5c81a3b1b4e00217c9211fd04d4731fa56b5f79a (diff) | |
| parent | c40e1d5131048d0f3a895ba9fc02af4514437cc3 (diff) | |
Merge "Keystore 2.0: Add namespace locksettings." am: 6bcd65c99e am: 965c7e3c91 am: c40e1d5131
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676196
Change-Id: Ifa0aafc8c2f5d412e2336c55db027277d94ca84e
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 */ |