am 21c8a493: Merge "DOn\'t save encryption settings when not encrypted" into mnc-dev

* commit '21c8a4930630d9f0a4b0dc3d56534b0b30bb0851':
  DOn't save encryption settings when not encrypted

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() {