commit 5eb9d6587a377a859388253a36a8a88932912bdc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Sep 30 05:32:37 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 30 05:32:37 2024 +0000
tree 0b6cfee6fcb1acdf443b20b31c06becc17966f6f
parent 100904b7efd3ad7c387ca97baf407165e7000fa6
parent 52f8abc2f399ff4eac9f7951aca1f46e929d03cb

Merge "profcollect: gracefully handle ServiceSpecificException" into main

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 eee2821..49086af 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -1469,7 +1469,7 @@
             // The starting window should keep covering its task when a pure TaskFragment is added
             // because its bounds may not fill the task.
             final ActivityRecord top = getTopMostActivity();
-            if (top != null) {
+            if (top != null && !top.hasFixedRotationTransform()) {
                 top.associateStartingWindowWithTaskIfNeeded();
             }
         }