commit abc62403870f4d47ac660c784b3b4d3bd31d00d5
author Vali Calinescu <vcalinescu@google.com> Tue Feb 28 18:19:17 2023 +0000
committer Vali Calinescu <vcalinescu@google.com> Wed Mar 01 10:44:28 2023 +0000
tree 37539f49c6be8e2f266c9dac4eaa514f0c26a257
parent 45b4cad82c79c7d76f05a6e16e12d829224f44aa

Change Size Compat mode resizability heuristic to look at top activity

Size Compat mode should be based only on top activity properties to improve debugging and predictability for the developer. The current policy of looking at the root activity was too aggressive and counter intuitive to developers, so we are changing the heuristic for resizability to look at the top activity instead. Now it will be easier to predict through the code analysis in an IDE that an activity will go in SCM since that will depend only on activity properties defined in the manifest and not on the order in which activities are launched.

Fix: 227795096
Test: manually with a test app
Test: atest WmTests:SizeCompatTests#testShouldCreateCompatDisplayInsetsWhenUnresizeableAndSupportsSizeChangesFalse

Change-Id: I5f57936ce65ceb5052d78398f3602eae669ea3cb

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

diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index 5f8e01e..9944f12 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -7973,11 +7973,7 @@
                 return false;
             }
         }
-        // Activity should be resizable if the task is.
-        final boolean isResizeable = task != null
-                ? task.isResizeable() || isResizeable()
-                : isResizeable();
-        return !isResizeable && (info.isFixedOrientation() || hasFixedAspectRatio())
+        return !isResizeable() && (info.isFixedOrientation() || hasFixedAspectRatio())
                 // The configuration of non-standard type should be enforced by system.
                 // {@link WindowConfiguration#ACTIVITY_TYPE_STANDARD} is set when this activity is
                 // added to a task, but this function is called when resolving the launch params, at

services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java

diff --git a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java
index 318fff2..b772ee3 100644
--- a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java
@@ -809,7 +809,7 @@
                 .setResizeMode(ActivityInfo.RESIZE_MODE_UNRESIZEABLE)
                 .setScreenOrientation(SCREEN_ORIENTATION_PORTRAIT)
                 .build();
-        assertFalse(activity.shouldCreateCompatDisplayInsets());
+        assertTrue(activity.shouldCreateCompatDisplayInsets());
 
         // The non-resizable activity should not be size compat because it is on a resizable task
         // in multi-window mode.
@@ -842,7 +842,7 @@
     }
 
     @Test
-    public void testShouldNotCreateCompatDisplayInsetsWhenRootActivityIsResizeable() {
+    public void testShouldCreateCompatDisplayInsetsWhenUnresizeableAndSupportsSizeChangesFalse() {
         setUpDisplaySizeWithApp(1000, 2500);
 
         // Make the task root resizable.
@@ -851,7 +851,7 @@
         // Create an activity on the same task.
         final ActivityRecord activity = buildActivityRecord(/* supportsSizeChanges= */false,
                 RESIZE_MODE_UNRESIZEABLE, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-        assertFalse(activity.shouldCreateCompatDisplayInsets());
+        assertTrue(activity.shouldCreateCompatDisplayInsets());
     }
 
     @Test