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

Commit cdd7d398 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add a intent creator token for the activity interceptors" into main

parents c9c25bc6 1a44f191
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -272,6 +272,12 @@ class ActivityStartInterceptor {
            mActivityOptions = interceptResult.getActivityOptions();
            mCallingPid = mRealCallingPid;
            mCallingUid = mRealCallingUid;
            // When an activity launch is intercepted, Intent#prepareToLeaveProcess is not called
            // since the interception happens in the system_server. So if any activity is calling
            // a trampoline activity, the keys do not get collected. Since all the interceptors
            // are present in the system_server, add the creator token before launching the
            // intercepted intent.
            mService.mAmInternal.addCreatorToken(mIntent, mCallingPackage);
            if (interceptResult.isActivityResolved()) {
                return true;
            }