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

Commit 55de25c0 authored by Paul Lawrence's avatar Paul Lawrence Committed by android-build-merger
Browse files

Merge "Fix bug in new encryption API" into nyc-dev 

am: d685353a

* commit 'd685353a':
  Fix bug in new encryption API
parents 08651fb8 d685353a

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

+4 −4
Original line number Diff line number Diff line
@@ -4862,10 +4862,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
     * {@link DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE}.

     */

    private int getEncryptionStatus() {

        if (!StorageManager.isNonDefaultBlockEncrypted()) {

            return DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_DEFAULT_KEY;

        } else if (StorageManager.isEncrypted()) {

            return DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE;

        if (StorageManager.isEncrypted()) {

            return StorageManager.isNonDefaultBlockEncrypted() ?

                      DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE

                    : DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_DEFAULT_KEY;

        } else if (StorageManager.isEncryptable()) {

            return DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE;

        } else {