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

Commit a8965da9 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android (Google) Code Review
Browse files

Merge "Expose Credentials.UNLOCK_ACTION for callers that want to use startActivityForResult"

parents f7a4cafd 4a9e1a24

keystore/java/android/security/Credentials.java

+3 −1
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ public class Credentials { 


    public static final String INSTALL_ACTION = "android.credentials.INSTALL";



    public static final String UNLOCK_ACTION = "com.android.credentials.UNLOCK";



    /** Key prefix for CA certificates. */

    public static final String CA_CERTIFICATE = "CACERT_";
@@ -69,7 +71,7 @@ public class Credentials { 


    public void unlock(Context context) {

        try {

            Intent intent = new Intent("com.android.credentials.UNLOCK");

            Intent intent = new Intent(UNLOCK_ACTION);

            context.startActivity(intent);

        } catch (ActivityNotFoundException e) {

            Log.w(LOGTAG, e.toString());