commit ecc2cde45be8fd5630f55bcf78a9f221cba1f276
author Polina Bondarenko <pbond@google.com> Wed Oct 16 11:53:36 2019 +0200
committer Polina Bondarenko <pbond@google.com> Wed Oct 16 13:40:31 2019 +0200
tree 80323c8b58aeb5412be4121e4e1de65f9bc0c990
parent 0b77cb99030f4b95a7c977cac5bea0756c71d19c

Fix KeyChain.KEY_ALIAS_SELECTION_DENIED

Remove the UUID suffix from the constant to make it less confusing.

Bug: 142347719
Test: compile
Change-Id: I6e73f1ef71c30c5b4388931abc8e431eaede6ece

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 40106b3..c914a55 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -40856,7 +40856,7 @@
     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 {

keystore/java/android/security/KeyChain.java

diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java
index bf23634..254456c 100644
--- a/keystore/java/android/security/KeyChain.java
+++ b/keystore/java/android/security/KeyChain.java
@@ -350,7 +350,7 @@
      * 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