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

Commit 8e73c69e authored Oct 07, 2019 by TreeHugger Robot Committed by Android (Google) Code Review Oct 07, 2019

Merge "Add KeyChain.KEY_ALIAS_SELECTION_DENIED constant."

parents c7401c82 a75bf0ca

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -40804,6 +40804,7 @@ package android.security {
		field public static final String EXTRA_KEY_ALIAS = "android.security.extra.KEY_ALIAS";
		field public static final String EXTRA_NAME = "name";
		field public static final String EXTRA_PKCS12 = "PKCS12";
		field public static final String KEY_ALIAS_SELECTION_DENIED = "alias-selection-denied-ef829e15-210a-409d-96c9-ee684fc41972";
		}

		public interface KeyChainAliasCallback {

core/java/android/app/admin/DelegatedAdminReceiver.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,10 @@ public class DelegatedAdminReceiver extends BroadcastReceiver {
		* Allows this receiver to select the alias for a private key and certificate pair for
		* authentication. If this method returns null, the default {@link android.app.Activity} will
		* be shown that lets the user pick a private key and certificate pair.
		* If this method returns {@link KeyChain#KEY_ALIAS_SELECTION_DENIED},
		* the default {@link android.app.Activity} will not be shown and the user will not be allowed
		* to pick anything. And the app, that called {@link KeyChain#choosePrivateKeyAlias}, will
		* receive {@code null} back.
		*
		* <p> This callback is only applicable if the delegated app has
		* {@link DevicePolicyManager#DELEGATION_CERT_SELECTION} capability. Additionally, it must

core/java/android/app/admin/DeviceAdminReceiver.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -791,6 +791,10 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* Allows this receiver to select the alias for a private key and certificate pair for
		* authentication. If this method returns null, the default {@link android.app.Activity} will be
		* shown that lets the user pick a private key and certificate pair.
		* If this method returns {@link KeyChain#KEY_ALIAS_SELECTION_DENIED},
		* the default {@link android.app.Activity} will not be shown and the user will not be allowed
		* to pick anything. And the app, that called {@link KeyChain#choosePrivateKeyAlias}, will
		* receive {@code null} back.
		*
		* @param context The running context as per {@link #onReceive}.
		* @param intent The received intent as per {@link #onReceive}.

keystore/java/android/security/KeyChain.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -342,6 +342,16 @@ public final class KeyChain {
		*/
		public static final int KEY_ATTESTATION_FAILURE = 4;

		/**
		* Used by DPC or delegated app in
		* {@link android.app.admin.DeviceAdminReceiver#onChoosePrivateKeyAlias} or
		* {@link android.app.admin.DelegatedAdminReceiver#onChoosePrivateKeyAlias} to identify that
		* the requesting app is not granted access to any key, and nor will the user be able to grant
		* access manually.
		*/
		public static final String KEY_ALIAS_SELECTION_DENIED =
		"alias-selection-denied-ef829e15-210a-409d-96c9-ee684fc41972";

		/**
		* Returns an {@code Intent} that can be used for credential
		* installation. The intent may be used without any extras, in