commit a8965da9886496952c6f97a402c4682ee1e37c81
author Brian Carlstrom <bdc@google.com> Sat Apr 23 21:01:35 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 23 21:01:35 2011 -0700
tree 87e9658c6c4d38b2274d59f2444df41bf967e00f
parent f7a4cafd249d01d5b2ae5c5c7eb248ee9a511c89
parent 4a9e1a2494f2e48b157506d7c731187907b7fd4e

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

keystore/java/android/security/Credentials.java

diff --git a/keystore/java/android/security/Credentials.java b/keystore/java/android/security/Credentials.java
index c650141..6b69b8a 100644
--- a/keystore/java/android/security/Credentials.java
+++ b/keystore/java/android/security/Credentials.java
@@ -31,6 +31,8 @@
 
     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 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());