Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev

2015-09-01 18:46:19 +00:00
parent f33098eaa0 e47a2ab83e
commit a104c05da9
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();
            }
        }