diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-04-23 21:01:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-23 21:01:35 -0700 |
| commit | a8965da9886496952c6f97a402c4682ee1e37c81 (patch) | |
| tree | 87e9658c6c4d38b2274d59f2444df41bf967e00f /keystore/java/android/security/Credentials.java | |
| parent | f7a4cafd249d01d5b2ae5c5c7eb248ee9a511c89 (diff) | |
| parent | 4a9e1a2494f2e48b157506d7c731187907b7fd4e (diff) | |
| download | frameworks_base-a8965da9886496952c6f97a402c4682ee1e37c81.zip frameworks_base-a8965da9886496952c6f97a402c4682ee1e37c81.tar.gz frameworks_base-a8965da9886496952c6f97a402c4682ee1e37c81.tar.bz2 | |
Merge "Expose Credentials.UNLOCK_ACTION for callers that want to use startActivityForResult"
Diffstat (limited to 'keystore/java/android/security/Credentials.java')
| -rw-r--r-- | keystore/java/android/security/Credentials.java | 4 |
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()); |