Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev

This commit is contained in:
Lucky Zhang
2014-12-13 00:15:31 +00:00
committed by Android (Google) Code Review

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;
} }
} }
} }