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

Commit f85be717 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev 

* commit '7d96dc6d':
  Fix getStorageEncryptionStatus() in DevicePolicyManager
parents eab518b4 7d96dc6d

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -3390,7 +3390,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
    private int getEncryptionStatus() {

        String status = SystemProperties.get("ro.crypto.state", "unsupported");

        if ("encrypted".equalsIgnoreCase(status)) {

            return DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE;

            return LockPatternUtils.isDeviceEncrypted()

                    ? DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE

                    : DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE;

        } else if ("unencrypted".equalsIgnoreCase(status)) {

            return DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE;

        } else {