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

Commit dc15bb4e authored by Nandana Dutt's avatar Nandana Dutt
Browse files

Allow R targeting apps a legacy view 

Allow R targeting apps to have a legacy view when accessing sdcard via
raw file paths temporarily.

This will let us bring back a986bc64

This will also let apps that target R and keep
the legacy flag to use raw paths continue to work until we enable FUSE

BUG: 137755945
BUG: 131432978
Test: atest CtsDeqpTestCases
Test: atest RestrictedPermissionsTest
Test: atest RestrictedStoragePermissionSharedUidTest
Change-Id: I0d49eca9d4e1769dcd3c0e2338db5b5e5a473032
parent 3522d985

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

+16 −1
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.ApplicationInfo;

import android.content.pm.IPackageManager;

import android.content.pm.IPackageMoveObserver;

import android.content.pm.PackageManager;
@@ -3898,8 +3899,22 @@ class StorageManagerService extends IStorageManager.Stub 


            // Otherwise we're willing to give out sandboxed or non-sandboxed if

            // they hold the runtime permission

            final boolean hasLegacy = mIAppOpsService.checkOperation(OP_LEGACY_STORAGE,

            boolean hasLegacy = mIAppOpsService.checkOperation(OP_LEGACY_STORAGE,

                    uid, packageName) == MODE_ALLOWED;



            // Hack(b/147137425): we have to honor hasRequestedLegacyExternalStorage for a short

            // while to enable 2 cases.

            // 1) Apps that want to be in scoped storage in R, but want to opt out in Q devices,

            // because they want to use raw file paths, would fail until fuse is enabled by default.

            // 2) Test apps that target current sdk will fail. They would fail even after fuse is

            // enabled, but we are fixing it with b/142395442. We are not planning to enable

            // fuse by default until b/142395442 is fixed.

            if (!hasLegacy && !mIsFuseEnabled) {

                ApplicationInfo ai = mIPackageManager.getApplicationInfo(packageName,

                        0, UserHandle.getUserId(uid));

                hasLegacy = ai.hasRequestedLegacyExternalStorage();

            }



            if (hasLegacy && hasWrite) {

                return Zygote.MOUNT_EXTERNAL_WRITE;

            } else if (hasLegacy && hasRead) {