diff options
author | Kenny Root <kroot@google.com> | 2014-09-11 00:39:20 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-11 00:39:20 +0000 |
commit | 26e6beccf2cc3619e6108bbe25b01692b4dc9c8c (patch) | |
tree | 7f9b225adca4dea06f1ace7242ed33effb787ca4 | |
parent | 0b4c1a083b632d1c2ffa7f70046d78b4b0baec11 (diff) | |
parent | 695062916d4fdc01efbf7e4e925ff1fea636f8c3 (diff) | |
download | android_packages_apps_CertInstaller-26e6beccf2cc3619e6108bbe25b01692b4dc9c8c.tar.gz android_packages_apps_CertInstaller-26e6beccf2cc3619e6108bbe25b01692b4dc9c8c.tar.bz2 android_packages_apps_CertInstaller-26e6beccf2cc3619e6108bbe25b01692b4dc9c8c.zip |
am 69506291: resolved conflicts for merge of 48d20b70 to klp-dev
* commit '695062916d4fdc01efbf7e4e925ff1fea636f8c3':
Check component class instead of action
-rw-r--r-- | src/com/android/certinstaller/CertInstallerMain.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/certinstaller/CertInstallerMain.java b/src/com/android/certinstaller/CertInstallerMain.java index c83e99f..46ba696 100644 --- a/src/com/android/certinstaller/CertInstallerMain.java +++ b/src/com/android/certinstaller/CertInstallerMain.java @@ -51,6 +51,8 @@ public class CertInstallerMain extends PreferenceActivity { "application/pkix-cert" }; + private static final String INSTALL_CERT_AS_USER_CLASS = ".InstallCertAsUser"; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -70,7 +72,9 @@ public class CertInstallerMain extends PreferenceActivity { * caller got here any other way, remove the extra that we allow in * that INSTALL_AS_USER path. */ - if (bundle != null && !Credentials.INSTALL_AS_USER_ACTION.equals(action)) { + String calledClass = intent.getComponent().getClassName(); + String installAsUserClassName = getPackageName() + INSTALL_CERT_AS_USER_CLASS; + if (bundle != null && !installAsUserClassName.equals(calledClass)) { bundle.remove(Credentials.EXTRA_INSTALL_AS_UID); } |