am 69506291: resolved conflicts for merge of 48d20b70 to klp-dev

* commit '695062916d4fdc01efbf7e4e925ff1fea636f8c3':
  Check component class instead of action

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);
             }