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

DO NOT MERGE. Block adoptable storage when using FBE. am: 6ed7418228

Browse Source 
am: b1123e7871

Change-Id: Ie1d13350e15e3bf5bb41d16b6960b55ebb8d966b
This commit is contained in:
Jeff Sharkey
2016-08-31 23:47:39 +00:00
committed by android-build-merger
parent bf41bf19ff b1123e7871
commit 72a6695bbc
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) {
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));
break;
}
@@ -1985,6 +1989,11 @@ class MountService extends IMountService.Stub
}
if ((mask & StorageManager.DEBUG_FORCE_ADOPTABLE) != 0) {
if (StorageManager.isFileEncryptedNativeOnly()) {
throw new IllegalStateException(
"Adoptable storage not available on device with native FBE");
}
synchronized (mLock) {
mForceAdoptable = (flags & StorageManager.DEBUG_FORCE_ADOPTABLE) != 0;