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

Commit 9441bab3 authored by Gaurav Bhola's avatar Gaurav Bhola Committed by Automerger Merge Worker
Browse files

Merge "Improve the activity coalescing" into udc-dev am: 87f7979d 

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



Change-Id: I304993a6f5bca611d6820f39e790d4a18a193ca9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a1b3e84 87f7979d

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;