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

Commit 03128dce authored by Paul Lawrence's avatar Paul Lawrence
Browse files

Fix bug in new encryption API 

Bug: 27583871
Change-Id: I372f0a6a411704dc57ca9bcc53c4c5a10b236772
parent 91f80006

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 {