From eb31ff008cc5df93144930fb93b0552edb30c800 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Wed, 23 Mar 2022 23:32:48 +0000 Subject: 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 --- services/core/java/com/android/server/DiskStatsService.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/services/core/java/com/android/server/DiskStatsService.java b/services/core/java/com/android/server/DiskStatsService.java index 1095ba31069f..5fed6d35c2bb 100644 --- a/services/core/java/com/android/server/DiskStatsService.java +++ b/services/core/java/com/android/server/DiskStatsService.java @@ -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); -- cgit v1.2.3-59-g8ed1b