Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bb1e4fb authored by Robin Lee's avatar Robin Lee
Browse files

Only setCredentialRequiredToDecrypt if primary user 

Change-Id: I3b68cc1169296aa95777e12fa27c3ede4291ec78
parent b5abaf6b

src/com/android/settings/ChooseLockPassword.java

+3 −1
Original line number Diff line number Diff line
@@ -641,9 +641,11 @@ public class ChooseLockPassword extends SettingsActivity { 
            setNextEnabled(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);

src/com/android/settings/ChooseLockPattern.java

+3 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/SaveChosenLockWorkerBase.java

+4 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.Fragment; 
import android.content.Intent;

import android.os.AsyncTask;

import android.os.Bundle;

import android.os.UserManager;



import com.android.internal.widget.LockPatternUtils;
@@ -67,7 +68,9 @@ abstract class SaveChosenLockWorkerBase extends Fragment { 
        mUtils.setSeparateProfileChallengeEnabled(mUserId, true);

        mWasSecureBefore = mUtils.isSecure(mUserId);



        if (UserManager.get(getContext()).getUserInfo(mUserId).isPrimary()) {

            mUtils.setCredentialRequiredToDecrypt(credentialRequired);

        }



        mFinished = false;

        mResultData = null;