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

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

Merge changes from topic "presubmit-am-cb3c43babe4c45069e5619a744950e15" into... 

Merge changes from topic "presubmit-am-cb3c43babe4c45069e5619a744950e15" into sc-qpr1-dev am: 214ad884

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



Change-Id: I97c8f7a192e7c6bf75426e459c1eb40c7773370b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8534aec6 214ad884

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

+11 −1
Original line number Diff line number Diff line
@@ -6313,7 +6313,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();










@@ -6342,6 +6342,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);