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

Commit 0d17b53c authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

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

Merge "DiskStatsService: stop checking for full-disk encryption" am: ca46dc18 am: 024d224d am: 3fc85daf am: 912ef9c9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2040809



Change-Id: Ib1ad6d74c76724bfcdd6aaf5a9934d17622c5607
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 266344e7 912ef9c9

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