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

* commit '9e06cbf5a379d0a05f13d2a6e1660793fb7015a3': Fix wrong stage exception in ChooseLockPattern
2015-09-01 19:07:30 +00:00
parent 9cc1143d8f 9e06cbf5a3
commit 060ce6b5a7
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();
            }
        }