Merge "Only setCredentialRequiredToDecrypt if primary user"

2016-01-29 11:02:57 +00:00
parent a14dac2c8f 5bb1e4fb90
commit c6ce1793f7
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;

@@ -69,7 +70,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;