From e47a2ab83eac80ed6e46606668db21b178168da7 Mon Sep 17 00:00:00 2001 From: Xiyuan Xia Date: Tue, 1 Sep 2015 11:29:36 -0700 Subject: [PATCH] Fix wrong stage exception in ChooseLockPattern ChooseLockPattern should updateStage instead of always enabling pattern view input. Bug:22760251 Change-Id: I3675c0aada293e168769147ba8e4203e9310e593 --- src/com/android/settings/ChooseLockPattern.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java index 641cc7f8d7c..1dd24f2068a 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(); } }