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

Commit 295d5556 authored by Eric Biggers's avatar Eric Biggers
Browse files

Use isFileEncrypted() instead of isFileEncryptedNativeOnly() 

Since emulated FBE is no longer supported, isFileEncryptedNativeOnly()
is the same as the new method isFileEncrypted().  Replace all
occurrences of isFileEncryptedNativeOnly() in this repository with
isFileEncrypted().

Bug: 232458753
Change-Id: I2af1e6ecb2655bd8a1ab6caf9e63040845572f1e
parent 3717f0d3

core/java/com/android/server/SystemConfig.java

+1 −1
Original line number Diff line number Diff line
@@ -1456,7 +1456,7 @@ public class SystemConfig { 


        // Some devices can be field-converted to FBE, so offer to splice in

        // those features if not already defined by the static config

        if (StorageManager.isFileEncryptedNativeOnly()) {

        if (StorageManager.isFileEncrypted()) {

            addFeature(PackageManager.FEATURE_FILE_BASED_ENCRYPTION, 0);

            addFeature(PackageManager.FEATURE_SECURELY_REMOVES_USERS, 0);

        }

services/core/java/com/android/server/DiskStatsService.java

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ public class DiskStatsService extends Binder { 
        reportFreeSpace(Environment.getMetadataDirectory(), "Metadata", pw, proto,

                DiskStatsFreeSpaceProto.FOLDER_METADATA);



        boolean fileBased = StorageManager.isFileEncryptedNativeOnly();

        boolean fileBased = StorageManager.isFileEncrypted();

        if (protoFormat) {

            if (fileBased) {

                proto.write(DiskStatsServiceDumpProto.ENCRYPTION,

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+1 −1
Original line number Diff line number Diff line
@@ -2631,7 +2631,7 @@ public class StatsPullAtomService extends SystemService { 
            latency = -1;

        }

        // File based encryption.

        boolean fileBased = StorageManager.isFileEncryptedNativeOnly();

        boolean fileBased = StorageManager.isFileEncrypted();



        //Recent disk write speed. Binder call to storaged.

        int writeSpeed = -1;

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1536,7 +1536,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        }















        boolean storageManagerIsFileBasedEncryptionEnabled() {













            return StorageManager.isFileEncryptedNativeOnly();













            return StorageManager.isFileEncrypted();















        }





























        Looper getMyLooper() {