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

Update Work Challenge check to take userId

Browse Source 
Change-Id: I239bca2dc55066c717d74487105646df22768d93
This commit is contained in:
Clara Bayarri
2015-12-18 16:40:18 +00:00
parent 8c9521f27c
commit b8a22e42d4
5 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,6 @@ import android.app.Fragment;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.UserHandle;
import com.android.internal.widget.LockPatternUtils;
@@ -38,6 +37,7 @@ abstract class SaveChosenLockWorkerBase extends Fragment {
protected boolean mHasChallenge;
protected long mChallenge;
protected boolean mWasSecureBefore;
protected int mUserId;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -57,12 +57,15 @@ abstract class SaveChosenLockWorkerBase extends Fragment {
}
protected void prepare(LockPatternUtils utils, boolean credentialRequired,
boolean hasChallenge, long challenge) {
boolean hasChallenge, long challenge, int userId) {
mUtils = utils;
mUserId = userId;
mHasChallenge = hasChallenge;
mChallenge = challenge;
mWasSecureBefore = mUtils.isSecure(UserHandle.myUserId());
// This will be a no-op for non managed profiles.
mUtils.setSeparateProfileChallengeEnabled(mUserId, true);
mWasSecureBefore = mUtils.isSecure(mUserId);
mUtils.setCredentialRequiredToDecrypt(credentialRequired);