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

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

KeyChain: add explicit package for getPrivateKey. 

Bug: 9964538
Change-Id: If67c1938e9506d4fa81b241bcbce2193d1b194ef
(cherry picked from commit 3a77213c)
parent ed8c67d4

keystore/java/android/security/KeyChain.java

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

     */

    private static final String ACTION_CHOOSER = "com.android.keychain.CHOOSER";

    private static final String ACTION_CHOOSER = "com.android.keychain.CHOOSER";





    /**

     * Package name for the Certificate Installer.

     */

    private static final String CERT_INSTALLER_PACKAGE = "com.android.certinstaller";



    /**

    /**

     * Extra for use with {@link #ACTION_CHOOSER}

     * Extra for use with {@link #ACTION_CHOOSER}

     * @hide Also used by KeyChainActivity implementation

     * @hide Also used by KeyChainActivity implementation
@@ -201,7 +206,7 @@ public final class KeyChain { 
     */

     */

    public static Intent createInstallIntent() {

    public static Intent createInstallIntent() {

        Intent intent = new Intent(ACTION_INSTALL);

        Intent intent = new Intent(ACTION_INSTALL);

        intent.setClassName("com.android.certinstaller",

        intent.setClassName(CERT_INSTALLER_PACKAGE,

                            "com.android.certinstaller.CertInstallerMain");

                            "com.android.certinstaller.CertInstallerMain");

        return intent;

        return intent;

    }

    }
@@ -267,6 +272,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.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);