summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2011-04-22 15:45:22 -0700
committerBrian Carlstrom <bdc@google.com>2011-04-22 15:45:22 -0700
commit4a9e1a2494f2e48b157506d7c731187907b7fd4e (patch)
tree9217f60ac23d368a31e89102ace0df5693ae3fdf /keystore
parent00425721c14a64979ae29b8a8daf24aafdabc56a (diff)
downloadframeworks_base-4a9e1a2494f2e48b157506d7c731187907b7fd4e.zip
frameworks_base-4a9e1a2494f2e48b157506d7c731187907b7fd4e.tar.gz
frameworks_base-4a9e1a2494f2e48b157506d7c731187907b7fd4e.tar.bz2
Expose Credentials.UNLOCK_ACTION for callers that want to use startActivityForResult
Change-Id: I729b2d8257bda3e7ff7858741ebd5415404880e7
Diffstat (limited to 'keystore')
-rw-r--r--keystore/java/android/security/Credentials.java4
1 files changed, 3 insertions, 1 deletions
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 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());