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

Only setCredentialRequiredToDecrypt if primary user

Browse Source 
Change-Id: I3b68cc1169296aa95777e12fa27c3ede4291ec78
This commit is contained in:
Robin Lee
2016-01-27 17:21:00 +00:00
parent b5abaf6bc8
commit 5bb1e4fb90
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

@@ -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);

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

@@ -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);

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

@@ -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);
mUtils.setCredentialRequiredToDecrypt(credentialRequired);
if (UserManager.get(getContext()).getUserInfo(mUserId).isPrimary()) {
mUtils.setCredentialRequiredToDecrypt(credentialRequired);
}
mFinished = false;
mResultData = null;