diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-10-07 14:57:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-10-07 14:57:42 +0000 |
| commit | 8e73c69e916deecfa6209a8d05bea51a283353d9 (patch) | |
| tree | d7c936b350f47d02821c2cf076b27a2dd718361f /core/java | |
| parent | c7401c820c97180a093c662b8112a3b8bb364a78 (diff) | |
| parent | a75bf0ca595116c1a6fa9e4ed4551a5b63a1b23a (diff) | |
Merge "Add KeyChain.KEY_ALIAS_SELECTION_DENIED constant."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/admin/DelegatedAdminReceiver.java | 4 | ||||
| -rw-r--r-- | core/java/android/app/admin/DeviceAdminReceiver.java | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DelegatedAdminReceiver.java b/core/java/android/app/admin/DelegatedAdminReceiver.java index f66de8d238ed..25b8eab452bf 100644 --- a/core/java/android/app/admin/DelegatedAdminReceiver.java +++ b/core/java/android/app/admin/DelegatedAdminReceiver.java @@ -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 diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java index 0c500da0294a..d175a66e90ea 100644 --- a/core/java/android/app/admin/DeviceAdminReceiver.java +++ b/core/java/android/app/admin/DeviceAdminReceiver.java @@ -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}. |