Merge "Keystore 2.0: Add namespace locksettings." am: 6bcd65c99e am: 965c7e3c91

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676196

Change-Id: Ib74fb9b45bd952dfaafd6f3dc65d4bcae304b418

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 {}
 
@@ -924,6 +925,13 @@ public abstract class KeyProperties {
     @SystemApi
     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