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

Commit 36e3011e authored by Chris Li's avatar Chris Li 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 udc-dev am: 265baa61

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



Change-Id: Idb572e730b9580622314b63f8f5b41eb58abf2bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents db3f5354 265baa61

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

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

import android.content.pm.ResolveInfo;

import android.os.Binder;

import android.os.Bundle;

import android.os.IBinder;

import android.os.Trace;

import android.os.UserHandle;
@@ -529,14 +528,14 @@ public class ActivityStartController { 
     * Starts an activity in the TaskFragment.

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

     * @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 callingUid the caller uid

     * @param callingPid the caller pid

     * @return the start result.

     */

    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 errorCallbackToken) {

        final ActivityRecord caller =

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

+3 −1
Original line number Diff line number Diff line
@@ -1189,8 +1189,10 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
                final IBinder callerActivityToken = operation.getActivityToken();

                final Intent activityIntent = operation.getActivityIntent();

                final Bundle activityOptions = operation.getBundle();

                final SafeActivityOptions safeOptions =

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

                final int result = mService.getActivityStartController()

                        .startActivityInTaskFragment(taskFragment, activityIntent, activityOptions,

                        .startActivityInTaskFragment(taskFragment, activityIntent, safeOptions,

                                callerActivityToken, caller.mUid, caller.mPid,

                                errorCallbackToken);

                if (!isStartResultSuccessful(result)) {