Merge "Update the path of the intent to unlock keystore." into honeycomb (7ccaba69) · Commits · e / os / android_frameworks_base

keystore/java/android/security/Credentials.java

+1 −13

Original line number	Diff line number	Diff line
		@@ -29,12 +29,8 @@ import java.security.KeyPair;
		public class 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 SYSTEM_INSTALL_ACTION = "android.credentials.SYSTEM_INSTALL";

		/** Key prefix for CA certificates. */
		public static final String CA_CERTIFICATE = "CACERT_";

		@@ -73,7 +69,7 @@ public class Credentials {

		public void unlock(Context context) {
		try {
		Intent intent = new Intent(UNLOCK_ACTION);
		Intent intent = new Intent("com.android.credentials.UNLOCK");
		context.startActivity(intent);
		} catch (ActivityNotFoundException e) {
		Log.w(LOGTAG, e.toString());
		@@ -107,12 +103,4 @@ public class Credentials {
		Log.w(LOGTAG, e.toString());
		}
		}

		public void installFromSdCard(Context context) {
		try {
		context.startActivity(createInstallIntent());
		} catch (ActivityNotFoundException e) {
		Log.w(LOGTAG, e.toString());
		}
		}
		}