Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4eae1492 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix KeyChain.KEY_ALIAS_SELECTION_DENIED"

parents 4c326230 ecc2cde4

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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 {

























keystore/java/android/security/KeyChain.java



+1
−1




























Original line number
Diff line number
Diff line








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