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

Merge "Fix KeyChain.KEY_ALIAS_SELECTION_DENIED"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-16 15:44:50 +00:00
committed by Android (Google) Code Review
parent 4c326230de ecc2cde45b
commit 4eae149289
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -40856,7 +40856,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";
field public static final String KEY_ALIAS_SELECTION_DENIED = "android:alias-selection-denied";
}
public interface KeyChainAliasCallback {

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

@@ -350,7 +350,7 @@ public final class KeyChain {
* access manually.
*/
public static final String KEY_ALIAS_SELECTION_DENIED =
"alias-selection-denied-ef829e15-210a-409d-96c9-ee684fc41972";
"android:alias-selection-denied";
/**
* Returns an {@code Intent} that can be used for credential