Only setCredentialRequiredToDecrypt if primary user

Change-Id: I3b68cc1169296aa95777e12fa27c3ede4291ec78
2016-01-27 17:21:00 +00:00
parent b5abaf6bc8
commit 5bb1e4fb90
3 changed files with 10 additions and 3 deletions
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -642,9 +642,11 @@ public class ChooseLockPattern extends SettingsActivity {
            setRightButtonEnabled(false);

            mSaveAndFinishWorker = new SaveAndFinishWorker();
+            mSaveAndFinishWorker.setListener(this);
+
            getFragmentManager().beginTransaction().add(mSaveAndFinishWorker,
                    FRAGMENT_TAG_SAVE_AND_FINISH).commit();
-            mSaveAndFinishWorker.setListener(this);
+            getFragmentManager().executePendingTransactions();

            final boolean required = getActivity().getIntent().getBooleanExtra(
                    EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);