Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DiskStatsService: stop checking for full-disk encryption" am: ca46dc186f am: 024d224ddd am: 3fc85dafa7

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

Change-Id: If6472cf90519a93d541ddd5a8ff491fd46b050c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers
2022-03-25 21:01:13 +00:00
committed by Automerger Merge Worker
parent 1caf8b928e 3fc85dafa7
commit 912ef9c967
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/DiskStatsService.java
View File

@@ -129,14 +129,10 @@ public class DiskStatsService extends Binder {
DiskStatsFreeSpaceProto.FOLDER_METADATA); DiskStatsFreeSpaceProto.FOLDER_METADATA);
boolean fileBased = StorageManager.isFileEncryptedNativeOnly(); boolean fileBased = StorageManager.isFileEncryptedNativeOnly();
boolean blockBased = fileBased ? false : StorageManager.isBlockEncrypted();
if (protoFormat) { if (protoFormat) {
if (fileBased) { if (fileBased) {
proto.write(DiskStatsServiceDumpProto.ENCRYPTION, proto.write(DiskStatsServiceDumpProto.ENCRYPTION,
DiskStatsServiceDumpProto.ENCRYPTION_FILE_BASED); DiskStatsServiceDumpProto.ENCRYPTION_FILE_BASED);
} else if (blockBased) {
proto.write(DiskStatsServiceDumpProto.ENCRYPTION,
DiskStatsServiceDumpProto.ENCRYPTION_FULL_DISK);
} else { } else {
proto.write(DiskStatsServiceDumpProto.ENCRYPTION, proto.write(DiskStatsServiceDumpProto.ENCRYPTION,
DiskStatsServiceDumpProto.ENCRYPTION_NONE); DiskStatsServiceDumpProto.ENCRYPTION_NONE);