commit 2bbbc9a2e8e23dc63ae1be56ab690381a7de344d
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jan 28 16:39:35 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 28 16:39:35 2022 +0000
tree c0ac3ba17030720379780cf62ee2d2e47e57a42e
parent 86d5713de2ca2a3a6c0c3de89289b4150eac70e3
parent 38785f0d6d7d0c9727f1c79c56aa5ee9776aab8a

Merge "Exclude WindowState from transition targets"

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

diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java
index ded58f4..ad45948 100644
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -1039,6 +1039,8 @@
                         "  Rejecting as detached: %s", wc);
                 continue;
             }
+            // The level of transition target should be at least window token.
+            if (wc.asWindowState() != null) continue;
 
             final ChangeInfo changeInfo = changes.get(wc);