commit 561345dda128951e24b702983a48004a5de78074
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Sep 17 02:27:25 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 17 02:27:25 2024 +0000
tree 9ca5b81ab82f8cbe55ccfaee8b74d9973cca9ec3
parent 78a9894cc542f537dfe2d8ab775bcab3fac54b54
parent a1642b864868365206c22ff2f03e8797d0ce5fde

Merge "Fix notifyTaskDisplayChanged is called every time onDisplayChanged is triggered." into main am: a1642b8648

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

Change-Id: I04775289c7054a11b6862b6546ba4deb4d9f6104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 728f739..eee2821 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -2790,11 +2790,15 @@
 
     @Override
     void onDisplayChanged(DisplayContent dc) {
+        final int lastDisplayId = getDisplayId();
         super.onDisplayChanged(dc);
         if (isLeafTask()) {
             final int displayId = (dc != null) ? dc.getDisplayId() : INVALID_DISPLAY;
-            mWmService.mAtmService.getTaskChangeNotificationController().notifyTaskDisplayChanged(
-                    mTaskId, displayId);
+            //Send the callback when the task reparented to another display.
+            if (lastDisplayId != displayId) {
+                mWmService.mAtmService.getTaskChangeNotificationController()
+                        .notifyTaskDisplayChanged(mTaskId, displayId);
+            }
         }
         if (isRootTask()) {
             updateSurfaceBounds();