PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 22ab07ea: am f7f0a85f: am 1f8fb0f8: Stop crash on repeated enters on virtual keyboard

Browse Source 
* commit '22ab07ea8fbb44eb9f461d0fb31431e05d6671ad':
  Stop crash on repeated enters on virtual keyboard
This commit is contained in:
Paul Lawrence
2015-08-19 14:20:31 +00:00
committed by Android Git Automerger
parent c1682e0a72 22ab07ea8f
commit 182b4263d3
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/ChooseLockPassword.java
View File

@@ -146,6 +146,10 @@ public class ChooseLockPassword extends SettingsActivity {
private int mRequestedQuality = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC; private int mRequestedQuality = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
private ChooseLockSettingsHelper mChooseLockSettingsHelper; private ChooseLockSettingsHelper mChooseLockSettingsHelper;
private Stage mUiStage = Stage.Introduction; private Stage mUiStage = Stage.Introduction;
// True once we have confirmed new PIN/password to prevent virtual keyboard
// re-entries of the same PIN
private boolean mDone = false;
private TextView mHeaderText; private TextView mHeaderText;
private String mFirstPin; private String mFirstPin;
private KeyboardView mKeyboardView; private KeyboardView mKeyboardView;
@@ -302,6 +306,7 @@ public class ChooseLockPassword extends SettingsActivity {
mCurrentPassword = savedInstanceState.getString(KEY_CURRENT_PASSWORD); mCurrentPassword = savedInstanceState.getString(KEY_CURRENT_PASSWORD);
} }
} }
mDone = false;
if (activity instanceof SettingsActivity) { if (activity instanceof SettingsActivity) {
final SettingsActivity sa = (SettingsActivity) activity; final SettingsActivity sa = (SettingsActivity) activity;
int id = mIsAlphaMode ? R.string.lockpassword_choose_your_password_header int id = mIsAlphaMode ? R.string.lockpassword_choose_your_password_header
@@ -509,6 +514,7 @@ public class ChooseLockPassword extends SettingsActivity {
public void handleNext() { public void handleNext() {
if (mDone) return;
mChosenPassword = mPasswordEntry.getText().toString(); mChosenPassword = mPasswordEntry.getText().toString();
if (TextUtils.isEmpty(mChosenPassword)) { if (TextUtils.isEmpty(mChosenPassword)) {
return; return;
@@ -524,6 +530,7 @@ public class ChooseLockPassword extends SettingsActivity {
} else if (mUiStage == Stage.NeedToConfirm) { } else if (mUiStage == Stage.NeedToConfirm) {
if (mFirstPin.equals(mChosenPassword)) { if (mFirstPin.equals(mChosenPassword)) {
setNextEnabled(false); setNextEnabled(false);
mDone = true;
new SaveChosenPasswordAndFinish().execute(); new SaveChosenPasswordAndFinish().execute();
} else { } else {
CharSequence tmp = mPasswordEntry.getText(); CharSequence tmp = mPasswordEntry.getText();