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

Commit a0503dca 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 

Change-Id: I07fcf866dd3559caa27231369b0755d5b5d4791a
parents 8d952c22 a32954ec

core/java/android/os/Environment.java

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

    public static boolean isExternalStorageLegacy(@NonNull File path) {

        final Context context = AppGlobals.getInitialApplication();

        final Context context = AppGlobals.getInitialApplication();

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

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

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

        if (Process.isIsolated(uid)) {

        if (Process.isIsolated(uid)) {

            return false;

            return false;

        }

        }
@@ -1277,8 +1278,6 @@ public class Environment { 
            return false;

            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 defaultScopedStorage = Compatibility.isChangeEnabled(DEFAULT_SCOPED_STORAGE);

        boolean forceEnableScopedStorage = Compatibility.isChangeEnabled(

        boolean forceEnableScopedStorage = Compatibility.isChangeEnabled(

                FORCE_ENABLE_SCOPED_STORAGE);

                FORCE_ENABLE_SCOPED_STORAGE);