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

Commit e1fa35a8 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Only grant visibility to result reciever" into rvc-dev am: 3759b4ce...

Merge "Only grant visibility to result reciever" into rvc-dev am: 3759b4ce am: 0a13271a am: 6a760c76 am: 96db627d am: cd8bd7b3

Change-Id: I5b90fc74d9a27376e3a822bf4928d882ff232875
parents e0e1e41d cd8bd7b3
Loading
Loading
Loading
Loading
+10 −4
Original line number Diff line number Diff line
@@ -1570,10 +1570,16 @@ class ActivityStarter {

        mService.mUgmInternal.grantUriPermissionFromIntent(mCallingUid, mStartActivity.packageName,
                mIntent, mStartActivity.getUriPermissionsLocked(), mStartActivity.mUserId);
        mService.getPackageManagerInternalLocked().grantImplicitAccess(
                mStartActivity.mUserId, mIntent,
                UserHandle.getAppId(mStartActivity.info.applicationInfo.uid), mCallingUid,
                true /*direct*/);
        if (mStartActivity.resultTo != null && mStartActivity.resultTo.info != null) {
            // we need to resolve resultTo to a uid as grantImplicitAccess deals explicitly in UIDs
            final PackageManagerInternal pmInternal =
                    mService.getPackageManagerInternalLocked();
            final int resultToUid = pmInternal.getPackageUidInternal(
                            mStartActivity.resultTo.info.packageName, 0, mStartActivity.mUserId);
            pmInternal.grantImplicitAccess(mStartActivity.mUserId, mIntent,
                    UserHandle.getAppId(mStartActivity.info.applicationInfo.uid) /*recipient*/,
                    resultToUid /*visible*/, true /*direct*/);
        }
        if (newTask) {
            EventLogTags.writeWmCreateTask(mStartActivity.mUserId,
                    mStartActivity.getTask().mTaskId);