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/SaveChosenLockWorkerBase.java
+++ b/src/com/android/settings/SaveChosenLockWorkerBase.java
@@ -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;