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

Commit 586d0f33 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not call into vold when the device is not block encrypted"

parents 6efe144d 14a8b1f3

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -2661,8 +2661,8 @@ class StorageManagerService extends IStorageManager.Stub 
        mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER,

        mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER,

            "no permission to access the crypt keeper");

            "no permission to access the crypt keeper");





        if (StorageManager.isFileEncryptedNativeOnly()) {

        if (!StorageManager.isBlockEncrypted()) {

            // Not supported on FBE devices

            // Only supported on FDE devices

            return;

            return;

        }

        }
@@ -2685,8 +2685,8 @@ class StorageManagerService extends IStorageManager.Stub 
        mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER,

        mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER,

            "no permission to access the crypt keeper");

            "no permission to access the crypt keeper");





        if (StorageManager.isFileEncryptedNativeOnly()) {

        if (!StorageManager.isBlockEncrypted()) {

            // Not supported on FBE devices

            // Only supported on FDE devices

            return null;

            return null;

        }

        }