PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only setCredentialRequiredToDecrypt if primary user"

Browse Source
This commit is contained in:
Robin Lee
2016-01-29 11:02:57 +00:00
committed by Android (Google) Code Review
parent a14dac2c8f 5bb1e4fb90
commit c6ce1793f7
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/ChooseLockPassword.java
View File

@@ -654,9 +654,11 @@ public class ChooseLockPassword extends SettingsActivity {
setNextEnabled(false); setNextEnabled(false);
mSaveAndFinishWorker = new SaveAndFinishWorker(); mSaveAndFinishWorker = new SaveAndFinishWorker();
mSaveAndFinishWorker.setListener(this);
getFragmentManager().beginTransaction().add(mSaveAndFinishWorker, getFragmentManager().beginTransaction().add(mSaveAndFinishWorker,
FRAGMENT_TAG_SAVE_AND_FINISH).commit(); FRAGMENT_TAG_SAVE_AND_FINISH).commit();
mSaveAndFinishWorker.setListener(this); getFragmentManager().executePendingTransactions();
final boolean required = getActivity().getIntent().getBooleanExtra( final boolean required = getActivity().getIntent().getBooleanExtra(
EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true); EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);

4
src/com/android/settings/ChooseLockPattern.java
View File

@@ -655,9 +655,11 @@ public class ChooseLockPattern extends SettingsActivity {
setRightButtonEnabled(false); setRightButtonEnabled(false);
mSaveAndFinishWorker = new SaveAndFinishWorker(); mSaveAndFinishWorker = new SaveAndFinishWorker();
mSaveAndFinishWorker.setListener(this);
getFragmentManager().beginTransaction().add(mSaveAndFinishWorker, getFragmentManager().beginTransaction().add(mSaveAndFinishWorker,
FRAGMENT_TAG_SAVE_AND_FINISH).commit(); FRAGMENT_TAG_SAVE_AND_FINISH).commit();
mSaveAndFinishWorker.setListener(this); getFragmentManager().executePendingTransactions();
final boolean required = getActivity().getIntent().getBooleanExtra( final boolean required = getActivity().getIntent().getBooleanExtra(
EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true); EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);

3
src/com/android/settings/SaveChosenLockWorkerBase.java
View File

@@ -20,6 +20,7 @@ import android.app.Fragment;
import android.content.Intent; import android.content.Intent;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserManager;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
@@ -69,7 +70,9 @@ abstract class SaveChosenLockWorkerBase extends Fragment {
mUtils.setSeparateProfileChallengeEnabled(mUserId, true); mUtils.setSeparateProfileChallengeEnabled(mUserId, true);
mWasSecureBefore = mUtils.isSecure(mUserId); mWasSecureBefore = mUtils.isSecure(mUserId);
if (UserManager.get(getContext()).getUserInfo(mUserId).isPrimary()) {
mUtils.setCredentialRequiredToDecrypt(credentialRequired); mUtils.setCredentialRequiredToDecrypt(credentialRequired);
}
mFinished = false; mFinished = false;
mResultData = null; mResultData = null;