diff options
| author | 2022-01-27 20:33:05 +0800 | |
|---|---|---|
| committer | 2022-01-27 20:33:05 +0800 | |
| commit | 38785f0d6d7d0c9727f1c79c56aa5ee9776aab8a (patch) | |
| tree | 3c664d44810ace561acd18e8851f7375b14aeb62 | |
| parent | 077c836e99fb7adeb2ed33cfbaec973a31dbcfc6 (diff) | |
Exclude WindowState from transition targets
Otherwise it may look weird to check whether the WindowState can
promote to ActivityRecord. The case happens when transferring
splash screen window, which will collect the starting window.
And usually the window level animation is done by someone other
than shell.
Bug: 194112093
Test: atest SurfaceControlTest
Change-Id: I11868342b9a76a0561718f0e549b412eb4282f6a
| -rw-r--r-- | services/core/java/com/android/server/wm/Transition.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index ded58f48b207..ad4594873cf0 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 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe " 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); |