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

Commit eb31ff00 authored by Eric Biggers's avatar Eric Biggers
Browse files

DiskStatsService: stop checking for full-disk encryption 

Since FDE (Full Disk Encryption) is no longer supported,
StorageManager.isBlockEncrypted() now always returns false.
In preparation for removing this method entirely, stop calling it from
DiskStatsService.dump().

Bug: 208476087
Change-Id: I25701ccae37005b087b221c62a07fb956887807a
parent 8f321a61

services/core/java/com/android/server/DiskStatsService.java

+0 −4
Original line number Diff line number Diff line
@@ -129,14 +129,10 @@ public class DiskStatsService extends Binder { 
                DiskStatsFreeSpaceProto.FOLDER_METADATA);



        boolean fileBased = StorageManager.isFileEncryptedNativeOnly();

        boolean blockBased = fileBased ? false : StorageManager.isBlockEncrypted();

        if (protoFormat) {

            if (fileBased) {

                proto.write(DiskStatsServiceDumpProto.ENCRYPTION,

                        DiskStatsServiceDumpProto.ENCRYPTION_FILE_BASED);

            } else if (blockBased) {

                proto.write(DiskStatsServiceDumpProto.ENCRYPTION,

                        DiskStatsServiceDumpProto.ENCRYPTION_FULL_DISK);

            } else {

                proto.write(DiskStatsServiceDumpProto.ENCRYPTION,

                        DiskStatsServiceDumpProto.ENCRYPTION_NONE);