commit 9d650a28fc300b7105b47a218bf7577dd1fb3e96
author Xiyuan Xia <xiyuan@google.com> Tue Sep 01 19:26:27 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 01 19:26:27 2015 +0000
tree 6405f94d424462b35044382c76166a10233491b8
parent daf2901a1a8b274aa60413661203a9abbb5f26b6
parent 4e4850802b8be707e15f4e31327f26b5f34eac0a

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

* commit '4e4850802b8be707e15f4e31327f26b5f34eac0a':
  Fix wrong stage exception in ChooseLockPattern

src/com/android/settings/ChooseLockPattern.java

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 @@
         @Override
         public void onResume() {
             super.onResume();
+            updateStage(mUiStage);
+
             if (mSaveAndFinishWorker != null) {
                 setRightButtonEnabled(false);
                 mSaveAndFinishWorker.setListener(this);
-            } else {
-                mLockPatternView.enableInput();
             }
         }