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

Commit 40799525 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Pass SafeActivityOptions with actual caller for startActivityInTF" into... 

Merge "Pass SafeActivityOptions with actual caller for startActivityInTF" into tm-dev am: 7ace523b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29786430



Change-Id: I6139ffa41ef06a2cc0d460713ba02bc088a78a07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7f7b9d01 7ace523b

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -39,7 +39,6 @@ import android.content.pm.ApplicationInfo; 
import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.pm.ResolveInfo;

import android.os.Binder;

import android.os.Binder;

import android.os.Bundle;

import android.os.IBinder;

import android.os.IBinder;

import android.os.UserHandle;

import android.os.UserHandle;

import android.provider.Settings;

import android.provider.Settings;
@@ -500,14 +499,14 @@ public class ActivityStartController { 
     * Starts an activity in the TaskFragment.

     * Starts an activity in the TaskFragment.

     * @param taskFragment TaskFragment {@link TaskFragment} to start the activity in.

     * @param taskFragment TaskFragment {@link TaskFragment} to start the activity in.

     * @param activityIntent intent to start the activity.

     * @param activityIntent intent to start the activity.

     * @param activityOptions ActivityOptions to start the activity with.

     * @param activityOptions SafeActivityOptions to start the activity with.

     * @param resultTo the caller activity

     * @param resultTo the caller activity

     * @param callingUid the caller uid

     * @param callingUid the caller uid

     * @param callingPid the caller pid

     * @param callingPid the caller pid

     * @return the start result.

     * @return the start result.

     */

     */

    int startActivityInTaskFragment(@NonNull TaskFragment taskFragment,

    int startActivityInTaskFragment(@NonNull TaskFragment taskFragment,

            @NonNull Intent activityIntent, @Nullable Bundle activityOptions,

            @NonNull Intent activityIntent, @Nullable SafeActivityOptions activityOptions,

            @Nullable IBinder resultTo, int callingUid, int callingPid,

            @Nullable IBinder resultTo, int callingUid, int callingPid,

            @Nullable IBinder errorCallbackToken) {

            @Nullable IBinder errorCallbackToken) {

        final ActivityRecord caller =

        final ActivityRecord caller =

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -722,8 +722,10 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
                }

                }

                final Intent activityIntent = hop.getActivityIntent();

                final Intent activityIntent = hop.getActivityIntent();

                final Bundle activityOptions = hop.getLaunchOptions();

                final Bundle activityOptions = hop.getLaunchOptions();

                final SafeActivityOptions safeOptions =

                        SafeActivityOptions.fromBundle(activityOptions, caller.mPid, caller.mUid);

                final int result = mService.getActivityStartController()

                final int result = mService.getActivityStartController()

                        .startActivityInTaskFragment(tf, activityIntent, activityOptions,

                        .startActivityInTaskFragment(tf, activityIntent, safeOptions,

                                hop.getCallingActivity(), caller.mUid, caller.mPid,

                                hop.getCallingActivity(), caller.mUid, caller.mPid,

                                errorCallbackToken);

                                errorCallbackToken);

                if (!isStartResultSuccessful(result)) {

                if (!isStartResultSuccessful(result)) {