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

Commit ca46dc18 authored by Eric Biggers's avatar Eric Biggers Committed by Gerrit Code Review
Browse files

Merge "DiskStatsService: stop checking for full-disk encryption"

parents 9c178778 eb31ff00

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);