commit 7c3708170cbefd6e89d64bc3372d6dc1d97d2a66
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 23 09:15:26 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 23 09:15:26 2019 +0000
tree 619850ad7973ce682f50ea308f02bbdb7decda5a
parent 27ad19ee9e9c3719b84263823217d53a33f50858
parent e9c1c319c70ab30aa53c029b6d54342230df3725

Merge "Restore window to undefined instead of freeform windowing mode" into qt-dev

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

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index ee6cf54..0820b0d 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -3372,6 +3372,11 @@
 
                 if (stack.inFreeformWindowingMode()) {
                     stack.setWindowingMode(WINDOWING_MODE_FULLSCREEN);
+                } else if (stack.getParent().inFreeformWindowingMode()) {
+                    // If the window is on a freeform display, set it to undefined. It will be
+                    // resolved to freeform and it can adjust windowing mode when the display mode
+                    // changes in runtime.
+                    stack.setWindowingMode(WINDOWING_MODE_UNDEFINED);
                 } else {
                     stack.setWindowingMode(WINDOWING_MODE_FREEFORM);
                 }