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

Commit 34dd66d8 authored by Abhijeet Kaur's avatar Abhijeet Kaur Committed by Automerger Merge Worker
Browse files

Merge "Remove a TODO as no work needs to be done" into rvc-dev am: a32954ec... 

Merge "Remove a TODO as no work needs to be done" into rvc-dev am: a32954ec am: ca6a0f99 am: 6b39d37d am: 3c4a4a4b am: 4d0f93b7

Change-Id: Ifd7eacd036405016177569d0c0eb11083ad4775e
parents b4a10ded 4d0f93b7

core/java/android/os/Environment.java

+1 −2
Original line number Diff line number Diff line
@@ -1271,6 +1271,7 @@ public class Environment { 
    public static boolean isExternalStorageLegacy(@NonNull File path) {

        final Context context = AppGlobals.getInitialApplication();

        final int uid = context.getApplicationInfo().uid;

        // Isolated processes and Instant apps are never allowed to be in scoped storage

        if (Process.isIsolated(uid)) {

            return false;

        }
@@ -1280,8 +1281,6 @@ public class Environment { 
            return false;

        }



        // TODO(b/150672994): Compat flags do not override instant app and isolated process's

        //  behavior.

        boolean defaultScopedStorage = Compatibility.isChangeEnabled(DEFAULT_SCOPED_STORAGE);

        boolean forceEnableScopedStorage = Compatibility.isChangeEnabled(

                FORCE_ENABLE_SCOPED_STORAGE);