diff options
author | Kenny Root <kroot@google.com> | 2014-09-11 00:50:34 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-11 00:50:34 +0000 |
commit | 9fa804c60ad9e91ea2296e1acf326f46189f362b (patch) | |
tree | 8871263eba6e6c94bd2cd3ebcdd498999b9d19fd | |
parent | f9894e7063701007a3611664a917f9144205abb8 (diff) | |
parent | 26e6beccf2cc3619e6108bbe25b01692b4dc9c8c (diff) | |
download | android_packages_apps_CertInstaller-9fa804c60ad9e91ea2296e1acf326f46189f362b.tar.gz android_packages_apps_CertInstaller-9fa804c60ad9e91ea2296e1acf326f46189f362b.tar.bz2 android_packages_apps_CertInstaller-9fa804c60ad9e91ea2296e1acf326f46189f362b.zip |
am 26e6becc: am 69506291: resolved conflicts for merge of 48d20b70 to klp-dev
* commit '26e6beccf2cc3619e6108bbe25b01692b4dc9c8c':
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); } |