diff options
| author | 2022-03-25 20:14:13 +0000 | |
|---|---|---|
| committer | 2022-03-25 20:14:13 +0000 | |
| commit | 024d224ddd1a32270024e78ff38fa7fa49d1f209 (patch) | |
| tree | 5296eb54e6637d976a65f5cf664f9d81d55d3428 | |
| parent | 996b96f0e324a25fb45b487f8686fe85336362fa (diff) | |
| parent | ca46dc186f961b43762b3b93e6637599d38d4faf (diff) | |
Merge "DiskStatsService: stop checking for full-disk encryption" am: ca46dc186f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2040809
Change-Id: Ia445a7820ebe9e412797b8b11b4543bb2a08e81d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/DiskStatsService.java | 4 |
1 files changed, 0 insertions, 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); |