Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add KeyChain.KEY_ALIAS_SELECTION_DENIED constant."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-07 14:57:42 +00:00
committed by Android (Google) Code Review
parent c7401c820c a75bf0ca59
commit 8e73c69e91
4 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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 {

4
core/java/android/app/admin/DelegatedAdminReceiver.java
View File

@@ -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

4
core/java/android/app/admin/DeviceAdminReceiver.java
View File

@@ -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}.

10
keystore/java/android/security/KeyChain.java
View File

@@ -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