diff options
| author | Robin Lee <rgl@google.com> | 2016-02-23 21:39:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-23 21:39:21 +0000 |
| commit | 366e5932c97aea65a147d55370eb94776be1fa56 (patch) | |
| tree | db2b685498c3ca9760c60f402321045a0650807d | |
| parent | 5bc3dabe05b3cc4c36cea7c68773cb8ba04fbdd7 (diff) | |
| parent | 7e2d30d880bdc751ee84a7782745f82911089374 (diff) | |
| download | android_packages_apps_CertInstaller-366e5932c97aea65a147d55370eb94776be1fa56.tar.gz android_packages_apps_CertInstaller-366e5932c97aea65a147d55370eb94776be1fa56.tar.bz2 android_packages_apps_CertInstaller-366e5932c97aea65a147d55370eb94776be1fa56.zip | |
resolve merge conflicts of ef177fb06e to cw-e-dev
am: 7e2d30d880
* commit '7e2d30d880bdc751ee84a7782745f82911089374':
Trust CA certificates added for the whole OS only
| -rw-r--r-- | src/com/android/certinstaller/CertInstaller.java | 3 | ||||
| -rw-r--r-- | src/com/android/certinstaller/CredentialHelper.java | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/certinstaller/CertInstaller.java b/src/com/android/certinstaller/CertInstaller.java index 0a6049e..dd334cb 100644 --- a/src/com/android/certinstaller/CertInstaller.java +++ b/src/com/android/certinstaller/CertInstaller.java @@ -181,7 +181,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 a3e2e27..0ef50bf 100644 --- a/src/com/android/certinstaller/CredentialHelper.java +++ b/src/com/android/certinstaller/CredentialHelper.java @@ -101,6 +101,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()); @@ -121,6 +122,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); @@ -257,6 +259,11 @@ class CredentialHelper { return mUid != -1; } + + int getInstallAsUid() { + return mUid; + } + Intent createSystemInstallIntent(final Context context) { Intent intent = new Intent("com.android.credentials.INSTALL"); // To prevent the private key from being sniffed, we explicitly spell |