am 060ce6b5: am 9e06cbf5: am a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev

* commit '060ce6b5a77e629a1a317f7fe4c2c62fc5ed3c04': Fix wrong stage exception in ChooseLockPattern
2015-09-01 19:15:28 +00:00
parent 938cf6f863 060ce6b5a7
commit 4e4850802b
1 changed files with 2 additions and 2 deletions
--- 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();
            }
        }