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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-02-28 07:06:45 +00:00
committed by Android (Google) Code Review
parent 6efe144d48 14a8b1f326
commit 586d0f3315
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -2661,8 +2661,8 @@ class StorageManagerService extends IStorageManager.Stub
mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER,
"no permission to access the crypt keeper");
if (StorageManager.isFileEncryptedNativeOnly()) {
// Not supported on FBE devices
if (!StorageManager.isBlockEncrypted()) {
// Only supported on FDE devices
return;
}
@@ -2685,8 +2685,8 @@ class StorageManagerService extends IStorageManager.Stub
mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER,
"no permission to access the crypt keeper");
if (StorageManager.isFileEncryptedNativeOnly()) {
// Not supported on FBE devices
if (!StorageManager.isBlockEncrypted()) {
// Only supported on FDE devices
return null;
}