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

Commit 964d1bd4 authored by Kenny Root's avatar Kenny Root Committed by Brint E. Kriebel
Browse files

Use the correct package name for CHOOSER. 

Bug: 13013106
Change-Id: I1f715de18e7108274f5a98234376d48c2d329438
(cherry picked from commit 89f4477c)
parent d8655b6b

keystore/java/android/security/KeyChain.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -88,6 +88,11 @@ public final class KeyChain { 
     */

     */

    public static final String ACCOUNT_TYPE = "com.android.keychain";

    public static final String ACCOUNT_TYPE = "com.android.keychain";





    /**

     * Package name for KeyChain chooser.

     */

    private static final String KEYCHAIN_PACKAGE = "com.android.keychain";



    /**

    /**

     * Action to bring up the KeyChainActivity

     * Action to bring up the KeyChainActivity

     */

     */
@@ -272,7 +277,7 @@ public final class KeyChain { 
            throw new NullPointerException("response == null");

            throw new NullPointerException("response == null");

        }

        }

        Intent intent = new Intent(ACTION_CHOOSER);

        Intent intent = new Intent(ACTION_CHOOSER);

        intent.setPackage(CERT_INSTALLER_PACKAGE);

        intent.setPackage(KEYCHAIN_PACKAGE);

        intent.putExtra(EXTRA_RESPONSE, new AliasResponse(response));

        intent.putExtra(EXTRA_RESPONSE, new AliasResponse(response));

        intent.putExtra(EXTRA_HOST, host);

        intent.putExtra(EXTRA_HOST, host);

        intent.putExtra(EXTRA_PORT, port);

        intent.putExtra(EXTRA_PORT, port);