diff options
author | Kenny Root <kroot@google.com> | 2014-09-10 20:37:17 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-10 20:37:17 +0000 |
commit | 48d20b70622a75a059a262163008ccec159751cd (patch) | |
tree | 551e3770a94b712114b88c81f3af2082286f9481 | |
parent | 69f0e1b2636a7118dc5bbb8e98393d9c91c85df0 (diff) | |
parent | 5aac53173509f394e67acd75b98c4d0731c86f76 (diff) | |
download | android_packages_apps_CertInstaller-48d20b70622a75a059a262163008ccec159751cd.tar.gz android_packages_apps_CertInstaller-48d20b70622a75a059a262163008ccec159751cd.tar.bz2 android_packages_apps_CertInstaller-48d20b70622a75a059a262163008ccec159751cd.zip |
am 5aac5317: Check component class instead of action
* commit '5aac53173509f394e67acd75b98c4d0731c86f76':
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 9b10c07..ea6f3e5 100644 --- a/src/com/android/certinstaller/CertInstallerMain.java +++ b/src/com/android/certinstaller/CertInstallerMain.java @@ -37,6 +37,8 @@ import libcore.io.IoUtils; * to the public {@link Credentials#INSTALL_ACTION} intent. */ public class CertInstallerMain extends CertFile implements Runnable { + 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 CertFile implements Runnable { * 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); } |