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

Commit 234ee35c authored by Eric Biggers's avatar Eric Biggers
Browse files

Drop FDE status checks from DevicePolicyManagerService 

Since FDE (Full Disk Encryption) is no longer supported, there is no
need for DevicePolicyManagerService.getEncryptionStatus() to check for
FDE-specific encryption statuses.

There is more that needs to be cleaned up here, but this gets rid of the
dependency on some obsolete StorageManager methods.

Bug: 208476087
Test: atest DevicePolicyManagerTest
Change-Id: I26c3fafc1b134177324de929d3600fb2dd7f4d1d
parent aa6698b0

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

+2 −28
Original line number Diff line number Diff line
@@ -1497,23 +1497,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            return StorageManager.isFileEncryptedNativeOnly();

        }













        boolean storageManagerIsNonDefaultBlockEncrypted() {













            final long identity = Binder.clearCallingIdentity();













            try {













                return StorageManager.isNonDefaultBlockEncrypted();













            } finally {













                Binder.restoreCallingIdentity(identity);













            }













        }

























        boolean storageManagerIsEncrypted() {













            return StorageManager.isEncrypted();













        }

























        boolean storageManagerIsEncryptable() {













            return StorageManager.isEncryptable();













        }



























        Looper getMyLooper() {















            return Looper.myLooper();















        }










@@ -7673,21 +7656,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {



























    /**















     * Hook to low-levels:  Reporting the current status of encryption.













     * @return A value such as {@link DevicePolicyManager#ENCRYPTION_STATUS_UNSUPPORTED},













     * {@link DevicePolicyManager#ENCRYPTION_STATUS_INACTIVE},













     * {@link DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE_DEFAULT_KEY},













     * {@link DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE_PER_USER}, or













     * {@link DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE}.













     * @return Either {@link DevicePolicyManager#ENCRYPTION_STATUS_UNSUPPORTED}













     * or {@link DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE_PER_USER}.















     */















    private int getEncryptionStatus() {















        if (mInjector.storageManagerIsFileBasedEncryptionEnabled()) {















            return DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_PER_USER;













        } else if (mInjector.storageManagerIsNonDefaultBlockEncrypted()) {













            return DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE;













        } else if (mInjector.storageManagerIsEncrypted()) {













            return DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_DEFAULT_KEY;













        } else if (mInjector.storageManagerIsEncryptable()) {













            return DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE;















        } else {















            return DevicePolicyManager.ENCRYPTION_STATUS_UNSUPPORTED;















        }

































services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java



+0
−15




























Original line number
Diff line number
Diff line








@@ -254,21 +254,6 @@ public class DevicePolicyManagerServiceTestable extends DevicePolicyManagerServi













            return services.storageManager.isFileBasedEncryptionEnabled();















        }





























        @Override













        boolean storageManagerIsNonDefaultBlockEncrypted() {













            return services.storageManager.isNonDefaultBlockEncrypted();













        }



























        @Override













        boolean storageManagerIsEncrypted() {













            return services.storageManager.isEncrypted();













        }



























        @Override













        boolean storageManagerIsEncryptable() {













            return services.storageManager.isEncryptable();













        }





























        @Override















        String getDevicePolicyFilePathForSystemUser() {















            return services.systemUserDataDir.getAbsolutePath() + "/";

































services/tests/servicestests/src/com/android/server/devicepolicy/MockSystemServices.java



+0
−12




























Original line number
Diff line number
Diff line








@@ -492,18 +492,6 @@ public class MockSystemServices {













        public boolean isFileBasedEncryptionEnabled() {















            return false;















        }



























        public boolean isNonDefaultBlockEncrypted() {













            return false;













        }



























        public boolean isEncrypted() {













            return false;













        }



























        public boolean isEncryptable() {













            return false;













        }















    }































    // We have to keep track of broadcast receivers registered for a given intent ourselves as the