Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edc3fbb9 authored by Paul Lawrence's avatar Paul Lawrence Committed by Android Git Automerger
Browse files

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

* commit '21c8a493':
  DOn't save encryption settings when not encrypted
parents 47247e72 21c8a493

core/java/com/android/internal/widget/LockPatternUtils.java

+5 −2
Original line number Diff line number Diff line
@@ -1097,9 +1097,12 @@ public class LockPatternUtils { 
            Log.w(TAG, "Only device owner may call setCredentialRequiredForDecrypt()");

            return;

        }



        if (isDeviceEncryptionEnabled()){

            Settings.Global.putInt(mContext.getContentResolver(),

               Settings.Global.REQUIRE_PASSWORD_TO_DECRYPT, required ? 1 : 0);

        }

    }



    private boolean isDoNotAskCredentialsOnBootSet() {

        return mDevicePolicyManager.getDoNotAskCredentialsOnBoot();