diff options
| author | Xiyuan Xia <xiyuan@google.com> | 2015-09-01 18:46:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-01 18:46:19 +0000 |
| commit | a104c05da9d42375f7307cce58039f7edafaa078 (patch) | |
| tree | 08cd549273cd9f1a46145baac007630e556cda0f /src/com/android/settings | |
| parent | f33098eaa02416997775fe1112484c56b13dc93b (diff) | |
| parent | e47a2ab83eac80ed6e46606668db21b178168da7 (diff) | |
| download | packages_apps_Settings-a104c05da9d42375f7307cce58039f7edafaa078.zip packages_apps_Settings-a104c05da9d42375f7307cce58039f7edafaa078.tar.gz packages_apps_Settings-a104c05da9d42375f7307cce58039f7edafaa078.tar.bz2 | |
Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/ChooseLockPattern.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java index 641cc7f..1dd24f2 100644 --- a/src/com/android/settings/ChooseLockPattern.java +++ b/src/com/android/settings/ChooseLockPattern.java @@ -444,11 +444,11 @@ public class ChooseLockPattern extends SettingsActivity { @Override public void onResume() { super.onResume(); + updateStage(mUiStage); + if (mSaveAndFinishWorker != null) { setRightButtonEnabled(false); mSaveAndFinishWorker.setListener(this); - } else { - mLockPatternView.enableInput(); } } |