commit 3a8d7fe153ae1fbfce6bc2cd378757df243f7f77
author Evan Rosky <erosky@google.com> Wed Nov 06 17:08:35 2019 -0800
committer Evan Rosky <erosky@google.com> Wed Nov 06 17:08:35 2019 -0800
tree 402d90a64556339645e9bfd9a75049db1ba549a5
parent 07a945d97bc49a57b7cc32abcceaadc3363a6e77

Fixed a small sizecompat check

Was only checking dev option, not actual sizecompat.

Bug: 143597834
Test: use caption to restore app in desktop.
Change-Id: I37e31212f6aee9da8c7e857c3ed7ee45f47d515e

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 da7af5f..a683ccb 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -3432,7 +3432,7 @@
 
                 if (stack.inFreeformWindowingMode()) {
                     stack.setWindowingMode(WINDOWING_MODE_FULLSCREEN);
-                } else if (!mSizeCompatFreeform) {
+                } else if (!mSizeCompatFreeform && r.inSizeCompatMode()) {
                     throw new IllegalStateException("Size-compat windows are currently not"
                             + "freeform-enabled");
                 } else if (stack.getParent().inFreeformWindowingMode()) {