am 03f336d0: am 5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev

* commit '03f336d07c055b6870dd18ab0096f9e5b085ff51':
  [FRP] Notification screen slides in wrong direction
This commit is contained in:
Lucky Zhang
2014-12-13 00:29:43 +00:00
committed by Android Git Automerger

View File

@@ -578,12 +578,12 @@ public class ChooseLockPattern extends SettingsActivity {
utils.setVisiblePatternEnabled(true); utils.setVisiblePatternEnabled(true);
} }
getActivity().setResult(RESULT_FINISHED);
getActivity().finish();
mDone = true;
if (!wasSecureBefore) { if (!wasSecureBefore) {
startActivity(getRedactionInterstitialIntent(getActivity())); startActivity(getRedactionInterstitialIntent(getActivity()));
} }
getActivity().setResult(RESULT_FINISHED);
getActivity().finish();
mDone = true;
} }
} }
} }