diff options
| author | Kenny Root <kroot@google.com> | 2014-09-11 04:26:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-11 04:26:03 +0000 |
| commit | 2482baf745fb3cd9aca6aff8b29fe13adde622e5 (patch) | |
| tree | 6700b8d31bf05649992950f4322e8c444a297381 | |
| parent | e9902377baf83e710f7b0ff89e7b2b245fb21874 (diff) | |
| parent | b3f3f024fc092114421e70b5b0f40c49d586fd48 (diff) | |
| download | android_packages_apps_CertInstaller-2482baf745fb3cd9aca6aff8b29fe13adde622e5.tar.gz android_packages_apps_CertInstaller-2482baf745fb3cd9aca6aff8b29fe13adde622e5.tar.bz2 android_packages_apps_CertInstaller-2482baf745fb3cd9aca6aff8b29fe13adde622e5.zip | |
am b3f3f024: am 9fa804c6: am 26e6becc: am 69506291: resolved conflicts for merge of 48d20b70 to klp-dev
* commit 'b3f3f024fc092114421e70b5b0f40c49d586fd48':
Check component class instead of action
| -rw-r--r-- | src/com/android/certinstaller/CertInstallerMain.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/certinstaller/CertInstallerMain.java b/src/com/android/certinstaller/CertInstallerMain.java index e184ae6..4271ca6 100644 --- a/src/com/android/certinstaller/CertInstallerMain.java +++ b/src/com/android/certinstaller/CertInstallerMain.java @@ -55,6 +55,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); |