diff options
| author | Kenny Root <kroot@google.com> | 2014-09-10 15:23:00 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2014-09-10 15:23:00 -0700 |
| commit | 695062916d4fdc01efbf7e4e925ff1fea636f8c3 (patch) | |
| tree | 7f9b225adca4dea06f1ace7242ed33effb787ca4 | |
| parent | 779301f35bdc0688119942b4297817831f57656e (diff) | |
| parent | 48d20b70622a75a059a262163008ccec159751cd (diff) | |
| download | android_packages_apps_CertInstaller-695062916d4fdc01efbf7e4e925ff1fea636f8c3.tar.gz android_packages_apps_CertInstaller-695062916d4fdc01efbf7e4e925ff1fea636f8c3.tar.bz2 android_packages_apps_CertInstaller-695062916d4fdc01efbf7e4e925ff1fea636f8c3.zip | |
resolved conflicts for merge of 48d20b70 to klp-dev
Change-Id: Ie07b8ef90a2447f26cdef5b30169793416bfbc0c
| -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); } |