DO NOT MERGE. Block adoptable storage when using FBE. (b1123e78) · Commits · e / os / android_frameworks_base

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -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;