Merge "Keystore 2.0 SPI: Add NAMESPACE_WIFI." (07f94fbb) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -8435,6 +8435,11 @@ package android.security.keystore {
		method @Deprecated @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setUid(int);
		}

		public abstract class KeyProperties {
		field public static final int NAMESPACE_APPLICATION = -1; // 0xffffffff
		field public static final int NAMESPACE_WIFI = 102; // 0x66
		}

		}

		package android.security.keystore.recovery {

+15 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ import android.annotation.IntDef;
		import android.annotation.NonNull;
		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;

		@@ -874,8 +876,17 @@ public abstract class KeyProperties {
		* which it must be configured in SEPolicy.
		* @hide
		*/
		@SystemApi
		public static final int NAMESPACE_APPLICATION = -1;

		/**
		* The namespace identifier for the WIFI Keystore namespace.
		* This must be kept in sync with system/sepolicy/private/keystore2_key_contexts
		* @hide
		*/
		@SystemApi
		public static final int NAMESPACE_WIFI = 102;

		/**
		* For legacy support, translate namespaces into known UIDs.
		* @hide
		@@ -884,6 +895,8 @@ public abstract class KeyProperties {
		switch (namespace) {
		case NAMESPACE_APPLICATION:
		return KeyStore.UID_SELF;
		case NAMESPACE_WIFI:
		return Process.WIFI_UID;
		// TODO Translate WIFI and VPN UIDs once the namespaces are defined.
		// b/171305388 and b/171305607
		default:
		@@ -900,6 +913,8 @@ public abstract class KeyProperties {
		switch (uid) {
		case KeyStore.UID_SELF:
		return NAMESPACE_APPLICATION;
		case Process.WIFI_UID:
		return NAMESPACE_WIFI;
		// TODO Translate WIFI and VPN UIDs once the namespaces are defined.
		// b/171305388 and b/171305607
		default: