Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 965c7e3c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0: Add namespace locksettings." am: 6bcd65c9 

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

Change-Id: I393181d2f10aced41b230546bd32ca936de3e73e
parents a48b43ec 6bcd65c9

keystore/java/android/security/keystore/KeyProperties.java

+8 −0
Original line number Diff line number Diff line
@@ -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