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

DiskStatsService: stop checking for full-disk encryption

Browse Source 
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
This commit is contained in:
Eric Biggers
2022-03-23 23:32:48 +00:00
parent 8f321a616b
commit eb31ff008c
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);
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);