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

am 26cb01e8: Merge "Use explicit intent for installing credentials." into gingerbread

Browse Source 
Merge commit '26cb01e880af5f23a58e4336facd30fa7d52581e' into gingerbread-plus-aosp

* commit '26cb01e880af5f23a58e4336facd30fa7d52581e':
  Use explicit intent for installing credentials.
This commit is contained in:
Hung-ying Tyan
2010-10-07 17:29:49 -07:00
committed by Android Git Automerger
parent bd38710bde 26cb01e880
commit 647ff64596
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,9 +80,16 @@ public class Credentials {
}
}
private Intent createInstallIntent() {
Intent intent = new Intent(INSTALL_ACTION);
intent.setClassName("com.android.certinstaller",
"com.android.certinstaller.CertInstallerMain");
return intent;
}
public void install(Context context, KeyPair pair) {
try {
Intent intent = new Intent(INSTALL_ACTION);
Intent intent = createInstallIntent();
intent.putExtra(PRIVATE_KEY, pair.getPrivate().getEncoded());
intent.putExtra(PUBLIC_KEY, pair.getPublic().getEncoded());
context.startActivity(intent);
@@ -93,7 +100,7 @@ public class Credentials {
public void install(Context context, String type, byte[] value) {
try {
Intent intent = new Intent(INSTALL_ACTION);
Intent intent = createInstallIntent();
intent.putExtra(type, value);
context.startActivity(intent);
} catch (ActivityNotFoundException e) {
@@ -103,7 +110,7 @@ public class Credentials {
public void installFromSdCard(Context context) {
try {
context.startActivity(new Intent(INSTALL_ACTION));
context.startActivity(createInstallIntent());
} catch (ActivityNotFoundException e) {
Log.w(LOGTAG, e.toString());
}