Merge "Use the correct intent variable for computing result caller info" into main (9e53369b) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3550,7 +3550,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		IBinder callerToken = new Binder();
		if (android.security.Flags.contentUriPermissionApis()) {
		try {
		resultTo.computeCallerInfo(callerToken, intent, this.getUid(),
		resultTo.computeCallerInfo(callerToken, resultData, this.getUid(),
		mAtmService.getPackageManager().getNameForUid(this.getUid()),
		/* isShareIdentityEnabled */ false);
		// Result callers cannot share their identity via