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

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

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

Change-Id: I953eacfd66b12c20d4aedaac8c91c4f00beff075
parents a2a11a28 0a13271a

services/core/java/com/android/server/wm/ActivityStarter.java

+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);