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

Commit 609cd022 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Copy KeyStore.UID_SELF to KeyProperties.UID_SELF" into main am: 00305306 am: ae26bcdc 

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



Change-Id: Ief8ce423d798916c85e2c42b0ce27aff5adcf054
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c80e93e5 ae26bcdc

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

+9 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.annotation.Nullable; 
import android.annotation.StringDef;

import android.annotation.SystemApi;

import android.os.Process;

import android.security.KeyStore;

import android.security.keymaster.KeymasterDefs;



import libcore.util.EmptyArray;
@@ -1007,6 +1006,13 @@ public abstract class KeyProperties { 
     */

    public static final int NAMESPACE_LOCKSETTINGS = 103;



    /**

     * The legacy UID that corresponds to {@link #NAMESPACE_APPLICATION}.

     * In new code, prefer to work with Keystore namespaces directly.

     * @hide

     */

    public static final int UID_SELF = -1;



    /**

     * For legacy support, translate namespaces into known UIDs.

     * @hide
@@ -1014,7 +1020,7 @@ public abstract class KeyProperties { 
    public static int namespaceToLegacyUid(@Namespace int namespace) {

        switch (namespace) {

            case NAMESPACE_APPLICATION:

                return KeyStore.UID_SELF;

                return UID_SELF;

            case NAMESPACE_WIFI:

                return Process.WIFI_UID;

            default:
@@ -1029,7 +1035,7 @@ public abstract class KeyProperties { 
     */

    public static @Namespace int legacyUidToNamespace(int uid) {

        switch (uid) {

            case KeyStore.UID_SELF:

            case UID_SELF:

                return NAMESPACE_APPLICATION;

            case Process.WIFI_UID:

                return NAMESPACE_WIFI;