Merge "new password shouldn't be empty string" am: dd7bd6b15a (7ed29288) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SetFullBackupPassword.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.app.backup.IBackupManager;
		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;
		@@ -96,6 +97,11 @@ Log.i(TAG, "failure; password mismatch?");
		}

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