Merge "Put track of systemUiContext before WM behind flag" into main

2 files changed, 12 insertions, 1 deletions

diff --git a/core/java/android/window/WindowTokenClientController.java b/core/java/android/window/WindowTokenClientController.java
index 1ec05b65861d..11019324acd8 100644
--- a/core/java/android/window/WindowTokenClientController.java
+++ b/core/java/android/window/WindowTokenClientController.java
@@ -35,6 +35,7 @@ import android.view.WindowManagerGlobal;
 
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.window.flags.Flags;
 
 /**
  * Singleton controller to manage the attached {@link WindowTokenClient}s, and to dispatch
@@ -137,7 +138,9 @@ public class WindowTokenClientController {
             // is initialized later, the SystemUiContext will start reporting from
             // DisplayContent#registerSystemUiContext, and WindowTokenClientController can report
             // the Configuration to the correct client.
-            recordWindowContextToken(client);
+            if (Flags.trackSystemUiContextBeforeWms()) {
+                recordWindowContextToken(client);
+            }
             return false;
         }
         final WindowContextInfo info;
diff --git a/core/tests/coretests/src/android/window/WindowTokenClientControllerTest.java b/core/tests/coretests/src/android/window/WindowTokenClientControllerTest.java
index bb2fe1bcfc64..84ff40f0dcf0 100644
--- a/core/tests/coretests/src/android/window/WindowTokenClientControllerTest.java
+++ b/core/tests/coretests/src/android/window/WindowTokenClientControllerTest.java
@@ -33,11 +33,15 @@ import android.app.ActivityThread;
 import android.content.res.Configuration;
 import android.os.IBinder;
 import android.os.RemoteException;
+import android.platform.test.annotations.EnableFlags;
 import android.platform.test.annotations.Presubmit;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.view.IWindowManager;
 
 import androidx.test.filters.SmallTest;
 
+import com.android.window.flags.Flags;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -58,6 +62,9 @@ public class WindowTokenClientControllerTest {
     @Rule
     public final MockitoRule mockito = MockitoJUnit.rule();
 
+    @Rule
+    public SetFlagsRule setFlagsRule = new SetFlagsRule();
+
     @Mock
     private IWindowManager mWindowManagerService;
     @Mock
@@ -161,6 +168,7 @@ public class WindowTokenClientControllerTest {
         verify(mWindowManagerService).detachWindowContext(mWindowTokenClient);
     }
 
+    @EnableFlags(Flags.FLAG_TRACK_SYSTEM_UI_CONTEXT_BEFORE_WMS)
     @Test
     public void testAttachToDisplayContent_keepTrackWithoutWMS() {
         // WMS is not initialized