diff options
author | Kenny Root <kroot@google.com> | 2014-05-08 13:28:39 -0700 |
---|---|---|
committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2014-11-12 20:07:14 +0000 |
commit | 826b18c410f76e4ab3c361638f7e0ffe6d8ef32e (patch) | |
tree | a58d94b7169294ce4078b6232b9f7aca20c9dc72 | |
parent | 1ddf3ba28889d28b1311cd8701f91fde4f8b9434 (diff) | |
download | android_packages_apps_CertInstaller-stable/cm-11.0-XNF9X.tar.gz android_packages_apps_CertInstaller-stable/cm-11.0-XNF9X.tar.bz2 android_packages_apps_CertInstaller-stable/cm-11.0-XNF9X.zip |
Check component class instead of actioncm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0
Ensure the called intent was filtered for permission by
ActivityManagerService by checking the ComponentName instead of the
action.
(cherry picked from commit 38a956408f45c9a7cbb48b79c67257b9207fda30)
Bug: 14441285
Change-Id: I3a848ef2375ddfa7c9b35389524419993a6b3693
-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); } |