Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7ccaba69: Merge "Update the path of the intent to unlock keystore." into honeycomb

Browse Source 
* commit '7ccaba693bd328968baf3f117b286659ce4a2a75':
  Update the path of the intent to unlock keystore.
This commit is contained in:
Chia-chi Yeh
2011-01-20 04:30:13 -08:00
committed by Android Git Automerger
parent f6f0ffd888 7ccaba693b
commit 956b9ed7fc
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
keystore/java/android/security/Credentials.java
View File

@@ -29,12 +29,8 @@ import java.security.KeyPair;
public class Credentials { public class Credentials {
private static final String LOGTAG = "Credentials"; private static final String LOGTAG = "Credentials";
public static final String UNLOCK_ACTION = "android.credentials.UNLOCK";
public static final String INSTALL_ACTION = "android.credentials.INSTALL"; public static final String INSTALL_ACTION = "android.credentials.INSTALL";
public static final String SYSTEM_INSTALL_ACTION = "android.credentials.SYSTEM_INSTALL";
/** Key prefix for CA certificates. */ /** Key prefix for CA certificates. */
public static final String CA_CERTIFICATE = "CACERT_"; public static final String CA_CERTIFICATE = "CACERT_";
@@ -73,7 +69,7 @@ public class Credentials {
public void unlock(Context context) { public void unlock(Context context) {
try { try {
Intent intent = new Intent(UNLOCK_ACTION); Intent intent = new Intent("com.android.credentials.UNLOCK");
context.startActivity(intent); context.startActivity(intent);
} catch (ActivityNotFoundException e) { } catch (ActivityNotFoundException e) {
Log.w(LOGTAG, e.toString()); Log.w(LOGTAG, e.toString());
@@ -107,12 +103,4 @@ public class Credentials {
Log.w(LOGTAG, e.toString()); Log.w(LOGTAG, e.toString());
} }
} }
public void installFromSdCard(Context context) {
try {
context.startActivity(createInstallIntent());
} catch (ActivityNotFoundException e) {
Log.w(LOGTAG, e.toString());
}
}
} }