Merge "DOn't save encryption settings when not encrypted" into mnc-dev

2015-05-15 22:22:18 +00:00
parent ce27996c4f 688af6c574
commit 21c8a49306
1 changed files with 5 additions and 2 deletions
--- a/core/java/com/android/internal/widget/LockPatternUtils.java
+++ b/core/java/com/android/internal/widget/LockPatternUtils.java
@@ -1097,8 +1097,11 @@ public class LockPatternUtils {
            Log.w(TAG, "Only device owner may call setCredentialRequiredForDecrypt()");
            return;
        }
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.REQUIRE_PASSWORD_TO_DECRYPT, required ? 1 : 0);
+
+        if (isDeviceEncryptionEnabled()){
+            Settings.Global.putInt(mContext.getContentResolver(),
+               Settings.Global.REQUIRE_PASSWORD_TO_DECRYPT, required ? 1 : 0);
+        }
    }

    private boolean isDoNotAskCredentialsOnBootSet() {