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

Commit 5f518a2a authored by Austin Borger's avatar Austin Borger Committed by Automerger Merge Worker
Browse files

Merge "ActivityManagerService: Allow openContentUri from... 

Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into udc-dev am: 5fe4d83c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22315336



Change-Id: I2736698ac42ac254669d398d606eff7c4b7dc936
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 23c2c833 5fe4d83c

services/core/java/com/android/server/am/ActivityManagerService.java

+11 −1
Original line number Diff line number Diff line
@@ -6915,7 +6915,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
        mActivityTaskManager.unhandledBack();

    }













    // TODO: Move to ContentProviderHelper?













    // TODO: Replace this method with one that returns a bound IContentProvider.















    public ParcelFileDescriptor openContentUri(String uriString) throws RemoteException {















        enforceNotIsolatedCaller("openContentUri");















        final int userId = UserHandle.getCallingUserId();










@@ -6944,6 +6944,16 @@ public class ActivityManagerService extends IActivityManager.Stub













                    Log.e(TAG, "Cannot find package for uid: " + uid);















                    return null;















                }

























                final ApplicationInfo appInfo = mPackageManagerInt.getApplicationInfo(













                        androidPackage.getPackageName(), /*flags*/0, Process.SYSTEM_UID,













                        UserHandle.USER_SYSTEM);













                if (!appInfo.isVendor() && !appInfo.isSystemApp() && !appInfo.isSystemExt()













                        && !appInfo.isProduct()) {













                    Log.e(TAG, "openContentUri may only be used by vendor/system/product.");













                    return null;













                }



























                final AttributionSource attributionSource = new AttributionSource(















                        Binder.getCallingUid(), androidPackage.getPackageName(), null);















                pfd = cph.provider.openFile(attributionSource, uri, "r", null);