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

Commit f3bbf2b8 authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Android (Google) Code Review
Browse files

Merge "Small fix related to cross-profile result intents."

parents c7ad12f4 6b942b8c

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

+3 −1
Original line number Diff line number Diff line
@@ -2537,8 +2537,10 @@ final class ActivityStack { 
                    + " who=" + r.resultWho + " req=" + r.requestCode

                    + " res=" + resultCode + " data=" + resultData);

            if (resultTo.userId != r.userId) {

                if (resultData != null) {

                    resultData.prepareToLeaveUser(r.userId);

                }

            }

            if (r.info.applicationInfo.uid > 0) {

                mService.grantUriPermissionFromIntentLocked(r.info.applicationInfo.uid,

                        resultTo.packageName, resultData,