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

Commit 3c7a57ae authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Allow activity coalescing when starting from last launched uid" into main

parents a56edb10 380b39a9
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -434,6 +434,10 @@ class ActivityMetricsLogger {
                    || mLastLaunchedActivity.getWindowingMode() != r.getWindowingMode()) {
                return false;
            }
            if (mLastLaunchedActivity.isUid(r.launchedFromUid)) {
                return true;
            }

            // The current task should be non-null because it is just launched. While the
            // last task can be cleared when starting activity with FLAG_ACTIVITY_CLEAR_TASK.
            final Task lastTask = mLastLaunchedActivity.getTask();
@@ -444,7 +448,8 @@ class ActivityMetricsLogger {
                }
                return lastTask.getBounds().equals(currentTask.getBounds());
            }
            return mLastLaunchedActivity.isUid(r.launchedFromUid);

            return false;
        }

        /** @return {@code true} if the activity matches a launched activity in this transition. */