diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-04-05 10:56:16 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-04-05 10:56:16 -0700 |
| commit | 65935b72de81cdc2048bc227e8c915e3509b30a8 (patch) | |
| tree | 04ab32c108f9900aacca29602c5538e52f5cb60d | |
| parent | 95ca4c7b92651cdec574df45adf9cc6d0b857629 (diff) | |
| parent | a47158ee848f4d77e241a8ef621443d4aad5e41c (diff) | |
| download | android_packages_apps_CertInstaller-65935b72de81cdc2048bc227e8c915e3509b30a8.tar.gz android_packages_apps_CertInstaller-65935b72de81cdc2048bc227e8c915e3509b30a8.tar.bz2 android_packages_apps_CertInstaller-65935b72de81cdc2048bc227e8c915e3509b30a8.zip | |
Merge tag 'android-6.0.1_r20' into HEAD
Ticket: CYNGNOS-2213
Android 6.0.1 release 20
| -rw-r--r-- | src/com/android/certinstaller/CertInstaller.java | 3 | ||||
| -rw-r--r-- | src/com/android/certinstaller/CredentialHelper.java | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/certinstaller/CertInstaller.java b/src/com/android/certinstaller/CertInstaller.java index 907646e..eb8fa90 100644 --- a/src/com/android/certinstaller/CertInstaller.java +++ b/src/com/android/certinstaller/CertInstaller.java @@ -180,7 +180,8 @@ public class CertInstaller extends Activity { Toast.makeText(this, getString(R.string.cert_is_added, mCredentials.getName()), Toast.LENGTH_LONG).show(); - if (mCredentials.hasCaCerts()) { + if (mCredentials.hasCaCerts() + && mCredentials.getInstallAsUid() == KeyStore.UID_SELF) { // more work to do, don't finish just yet new InstallCaCertsToKeyChainTask().execute(); return; diff --git a/src/com/android/certinstaller/CredentialHelper.java b/src/com/android/certinstaller/CredentialHelper.java index c131268..b502a1d 100644 --- a/src/com/android/certinstaller/CredentialHelper.java +++ b/src/com/android/certinstaller/CredentialHelper.java @@ -100,6 +100,7 @@ class CredentialHelper { try { outStates.putSerializable(DATA_KEY, mBundle); outStates.putString(KeyChain.EXTRA_NAME, mName); + outStates.putInt(Credentials.EXTRA_INSTALL_AS_UID, mUid); if (mUserKey != null) { outStates.putByteArray(Credentials.USER_PRIVATE_KEY, mUserKey.getEncoded()); @@ -120,6 +121,7 @@ class CredentialHelper { void onRestoreStates(Bundle savedStates) { mBundle = (HashMap) savedStates.getSerializable(DATA_KEY); mName = savedStates.getString(KeyChain.EXTRA_NAME); + mUid = savedStates.getInt(Credentials.EXTRA_INSTALL_AS_UID, -1); byte[] bytes = savedStates.getByteArray(Credentials.USER_PRIVATE_KEY); if (bytes != null) { setPrivateKey(bytes); @@ -256,6 +258,10 @@ class CredentialHelper { return mUid != -1; } + int getInstallAsUid() { + return mUid; + } + Intent createSystemInstallIntent() { Intent intent = new Intent("com.android.credentials.INSTALL"); // To prevent the private key from being sniffed, we explicitly spell |