From ecc2cde45be8fd5630f55bcf78a9f221cba1f276 Mon Sep 17 00:00:00 2001 From: Polina Bondarenko Date: Wed, 16 Oct 2019 11:53:36 +0200 Subject: [PATCH] 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 | 2 +- keystore/java/android/security/KeyChain.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index 40106b3a5724e..c914a55e7ce91 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 { diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java index bf2363481f733..254456cea5364 100644 --- a/keystore/java/android/security/KeyChain.java +++ b/keystore/java/android/security/KeyChain.java @@ -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