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

Commit 72a6695b authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

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

am: b1123e78

Change-Id: Ie1d13350e15e3bf5bb41d16b6960b55ebb8d966b
parents bf41bf19 b1123e78

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;