commit 83df03c8f5d61d37e2fda501c67937f970b7af0c
author Brian Carlstrom <bdc@google.com> Sun Apr 15 21:36:30 2012 -0700
committer Brian Carlstrom <bdc@google.com> Sun Apr 15 21:36:30 2012 -0700
tree 46bf0ca2b58ba925e21a8baf056aa6a1bfd65a59
parent 7cadd03679b93cc0f87a9cf8f421f99984cbb182

Allow empty passwords when installing from a PKCS#12 file

Bug: http://code.google.com/p/android/issues/detail?id=28189
Change-Id: I6ce96eba0e7e583e49a17179d3f3c66df5f13a29

src/com/android/certinstaller/CertInstaller.java

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 @@
                 .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) {