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
This commit is contained in:
Xiyuan Xia
2015-09-01 19:15:28 +00:00
committed by Android Git Automerger

View File

@@ -444,11 +444,11 @@ public class ChooseLockPattern extends SettingsActivity {
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
updateStage(mUiStage);
if (mSaveAndFinishWorker != null) { if (mSaveAndFinishWorker != null) {
setRightButtonEnabled(false); setRightButtonEnabled(false);
mSaveAndFinishWorker.setListener(this); mSaveAndFinishWorker.setListener(this);
} else {
mLockPatternView.enableInput();
} }
} }