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

Commit b276f95a authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Use quick path to start recents if the caller is trusted" into udc-dev am: 2308d69a 

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



Change-Id: Ia7813e6436cb3f4f6da16f5346c46c257e37bcf3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0971f0c9 2308d69a

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

+20 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 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;

import android.provider.Settings;

import android.util.Slog;
@@ -554,7 +555,25 @@ public class ActivityStartController { 
                .execute();

    }



    /**

     * A quick path (skip general intent/task resolving) to start recents animation if the recents

     * (or home) activity is available in background.

     * @return {@code true} if the recents activity is moved to front.

     */

    boolean startExistingRecentsIfPossible(Intent intent, ActivityOptions options) {

        try {

            Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "startExistingRecents");

            if (startExistingRecents(intent, options)) {

                return true;

            }

            // Else follow the standard launch procedure.

        } finally {

            Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);

        }

        return false;

    }



    private boolean startExistingRecents(Intent intent, ActivityOptions options) {

        final int activityType = mService.getRecentTasks().getRecentsComponent()

                .equals(intent.getComponent()) ? ACTIVITY_TYPE_RECENTS : ACTIVITY_TYPE_HOME;

        final Task rootTask = mService.mRootWindowContainer.getDefaultTaskDisplayArea()
@@ -563,6 +582,7 @@ public class ActivityStartController { 
        final ActivityRecord r = rootTask.topRunningActivity();

        if (r == null || r.isVisibleRequested() || !r.attachedToProcess()

                || !r.mActivityComponent.equals(intent.getComponent())

                || !mService.isCallerRecents(r.getUid())

                // Recents keeps invisible while device is locked.

                || r.mDisplayContent.isKeyguardLocked()) {

            return false;

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

+0 −17
Original line number Diff line number Diff line
@@ -5753,23 +5753,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                boolean validateIncomingUser, PendingIntentRecord originatingPendingIntent,

                BackgroundStartPrivileges backgroundStartPrivileges) {

            assertPackageMatchesCallingUid(callingPackage);

            // A quick path (skip general intent/task resolving) to start recents animation if the

            // recents (or home) activity is available in background.

            if (options != null && options.getOriginalOptions() != null

                    && options.getOriginalOptions().getTransientLaunch() && isCallerRecents(uid)) {

                try {

                    synchronized (mGlobalLock) {

                        Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "startExistingRecents");

                        if (mActivityStartController.startExistingRecentsIfPossible(

                                intent, options.getOriginalOptions())) {

                            return ActivityManager.START_TASK_TO_FRONT;

                        }

                        // Else follow the standard launch procedure.

                    }

                } finally {

                    Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);

                }

            }

            return getActivityStartController().startActivityInPackage(uid, realCallingPid,

                    realCallingUid, callingPackage, callingFeatureId, intent, resolvedType,

                    resultTo, resultWho, requestCode, startFlags, options, userId, inTask,

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

+15 −4
Original line number Diff line number Diff line
@@ -972,19 +972,30 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 


        switch (type) {

            case HIERARCHY_OP_TYPE_PENDING_INTENT: {

                final Bundle launchOpts = hop.getLaunchOptions();

                ActivityOptions activityOptions = launchOpts != null

                        ? new ActivityOptions(launchOpts) : null;

                if (activityOptions != null && activityOptions.getTransientLaunch()

                        && mService.isCallerRecents(hop.getPendingIntent().getCreatorUid())) {

                    if (mService.getActivityStartController().startExistingRecentsIfPossible(

                            hop.getActivityIntent(), activityOptions)) {

                        // Start recents successfully.

                        break;

                    }

                }



                String resolvedType = hop.getActivityIntent() != null

                        ? hop.getActivityIntent().resolveTypeIfNeeded(

                        mService.mContext.getContentResolver())

                        : null;



                ActivityOptions activityOptions = null;

                if (hop.getPendingIntent().isActivity()) {

                    // Set the context display id as preferred for this activity launches, so that

                    // it can land on caller's display. Or just brought the task to front at the

                    // display where it was on since it has higher preference.

                    activityOptions = hop.getLaunchOptions() != null

                            ? new ActivityOptions(hop.getLaunchOptions())

                            : ActivityOptions.makeBasic();

                    if (activityOptions == null) {

                        activityOptions = ActivityOptions.makeBasic();

                    }

                    activityOptions.setCallerDisplayId(DEFAULT_DISPLAY);

                }

                final Bundle options = activityOptions != null ? activityOptions.toBundle() : null;