Merge "new password shouldn't be empty string"
diff --git a/src/com/android/settings/SetFullBackupPassword.java b/src/com/android/settings/SetFullBackupPassword.java
index 4ab096b..b6a03d5 100644
--- a/src/com/android/settings/SetFullBackupPassword.java
+++ b/src/com/android/settings/SetFullBackupPassword.java
@@ -21,6 +21,7 @@
import android.os.Bundle;
import android.os.RemoteException;
import android.os.ServiceManager;
+import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;
@@ -45,7 +46,7 @@
if (!newPw.equals(confirmPw)) {
// Mismatch between new pw and its confirmation re-entry
-Log.i(TAG, "password mismatch");
+ Log.i(TAG, "password mismatch");
Toast.makeText(SetFullBackupPassword.this,
R.string.local_backup_password_toast_confirmation_mismatch,
Toast.LENGTH_LONG).show();
@@ -56,14 +57,14 @@
if (setBackupPassword(curPw, newPw)) {
// success
-Log.i(TAG, "password set successfully");
+ Log.i(TAG, "password set successfully");
Toast.makeText(SetFullBackupPassword.this,
R.string.local_backup_password_toast_success,
Toast.LENGTH_LONG).show();
finish();
} else {
// failure -- bad existing pw, usually
-Log.i(TAG, "failure; password mismatch?");
+ Log.i(TAG, "failure; password mismatch?");
Toast.makeText(SetFullBackupPassword.this,
R.string.local_backup_password_toast_validation_failure,
Toast.LENGTH_LONG).show();
@@ -96,6 +97,11 @@
}
private boolean setBackupPassword(String currentPw, String newPw) {
+ // new password can't be empty
+ if (TextUtils.isEmpty(newPw)) {
+ return false;
+ }
+
try {
return mBackupManager.setBackupPassword(currentPw, newPw);
} catch (RemoteException e) {
