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

Commit 87f7979d authored by Gaurav Bhola's avatar Gaurav Bhola Committed by Android (Google) Code Review
Browse files

Merge "Improve the activity coalescing" into udc-dev

parents 16d277ab abf63715

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

+2 −1
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ class ActivityMetricsLogger { 
        /** Returns {@code true} if the incoming activity can belong to this transition. */

        boolean canCoalesce(ActivityRecord r) {

            return mLastLaunchedActivity.mDisplayContent == r.mDisplayContent

                    && mLastLaunchedActivity.getTask().getBounds().equals(r.getTask().getBounds())

                    && mLastLaunchedActivity.getWindowingMode() == r.getWindowingMode();

        }
@@ -646,7 +647,7 @@ class ActivityMetricsLogger { 
    void notifyActivityLaunched(@NonNull LaunchingState launchingState, int resultCode,

            boolean newActivityCreated, @Nullable ActivityRecord launchedActivity,

            @Nullable ActivityOptions options) {

        if (launchedActivity == null) {

        if (launchedActivity == null || launchedActivity.getTask() == null) {

            // The launch is aborted, e.g. intent not resolved, class not found.

            abort(launchingState, "nothing launched");

            return;