commit b90b46a543cac12c0025dc5639ad52410fc51d6e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Aug 14 03:19:01 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 14 03:19:01 2024 +0000
tree c5c1cd00f06b7a5c958445c6d4401d79ed79a5d1
parent 7c538b63ca0b6529825d327c717179c06e642f73
parent 8516c2549506fa850d5e19c43e93649fd15574c0

Merge "Fix the activity windowingmode error of exiting pip" 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 a310992..4a2694b 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -4772,6 +4772,9 @@
                     mTransitionController.collect(topActivity);
 
                     final Task lastParentBeforePip = topActivity.getLastParentBeforePip();
+                    // Reset the activity windowing mode to match the parent.
+                    topActivity.getRequestedOverrideConfiguration()
+                            .windowConfiguration.setWindowingMode(WINDOWING_MODE_UNDEFINED);
                     topActivity.reparent(lastParentBeforePip,
                             lastParentBeforePip.getChildCount() /* top */,
                             "movePinnedActivityToOriginalTask");