diff options
| author | Brian Carlstrom <bdc@google.com> | 2012-04-15 21:36:30 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2012-04-15 21:36:30 -0700 |
| commit | 83df03c8f5d61d37e2fda501c67937f970b7af0c (patch) | |
| tree | 46bf0ca2b58ba925e21a8baf056aa6a1bfd65a59 | |
| parent | 7cadd03679b93cc0f87a9cf8f421f99984cbb182 (diff) | |
| download | platform_packages_apps_CertInstaller-tools_r21.tar.gz platform_packages_apps_CertInstaller-tools_r21.tar.bz2 platform_packages_apps_CertInstaller-tools_r21.zip | |
Allow empty passwords when installing from a PKCS#12 fileandroid-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1tools_r21jb-releasejb-mr0-releasejb-dev
Bug: http://code.google.com/p/android/issues/detail?id=28189
Change-Id: I6ce96eba0e7e583e49a17179d3f3c66df5f13a29
| -rw-r--r-- | src/com/android/certinstaller/CertInstaller.java | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/com/android/certinstaller/CertInstaller.java b/src/com/android/certinstaller/CertInstaller.java index 0809ad3..d6e3ed6 100644 --- a/src/com/android/certinstaller/CertInstaller.java +++ b/src/com/android/certinstaller/CertInstaller.java @@ -332,15 +332,9 @@ public class CertInstaller extends Activity { .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { String password = mView.getText(R.id.credential_password); - if (TextUtils.isEmpty(password)) { - mView.setHasEmptyError(true); - removeDialog(PKCS12_PASSWORD_DIALOG); - showDialog(PKCS12_PASSWORD_DIALOG); - } else { - mNextAction = new Pkcs12ExtractAction(password); - mNextAction.run(CertInstaller.this); - } - } + mNextAction = new Pkcs12ExtractAction(password); + mNextAction.run(CertInstaller.this); + } }) .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { |