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

Merge "DO NOT MERGE. Block adoptable storage when using FBE." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-31 23:17:33 +00:00
committed by Android (Google) Code Review
parent 26887dc880 6ed7418228
commit c081d2b870
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/MountService.java
View File

@@ -1056,6 +1056,10 @@ class MountService extends IMountService.Stub
|| mForceAdoptable) { || mForceAdoptable) {
flags |= DiskInfo.FLAG_ADOPTABLE; flags |= DiskInfo.FLAG_ADOPTABLE;
} }
// Adoptable storage isn't currently supported on FBE devices
if (StorageManager.isFileEncryptedNativeOnly()) {
flags &= ~DiskInfo.FLAG_ADOPTABLE;
}
mDisks.put(id, new DiskInfo(id, flags)); mDisks.put(id, new DiskInfo(id, flags));
break; break;
} }
@@ -1985,6 +1989,11 @@ class MountService extends IMountService.Stub
} }
if ((mask & StorageManager.DEBUG_FORCE_ADOPTABLE) != 0) { if ((mask & StorageManager.DEBUG_FORCE_ADOPTABLE) != 0) {
if (StorageManager.isFileEncryptedNativeOnly()) {
throw new IllegalStateException(
"Adoptable storage not available on device with native FBE");
}
synchronized (mLock) { synchronized (mLock) {
mForceAdoptable = (flags & StorageManager.DEBUG_FORCE_ADOPTABLE) != 0; mForceAdoptable = (flags & StorageManager.DEBUG_FORCE_ADOPTABLE) != 0;