From 505dbe3dd9d9d8f59b1d950f9ad8823ba9b2f029 Mon Sep 17 00:00:00 2001
From: Charles Chen <charlesccchen@google.com>
Date: Mon, 12 Apr 2021 22:50:32 +0800
Subject: [PATCH] Fix WindowContext cannot receive global config

... change on secondary display.

Previously we listen to #onRequestedOverrideConfigurationChanged() to
receive config changes, which only propagate callbacks if there's a
requested override configuration. This CL changes to listen to
 #onMergedOverrideConfigurationChanged() to ensure every config change
will propagate to WindowContext.

fixes: 185190979
Test: atest WindowContextTests

Change-Id: I0299a2795bd0b009ec2291a36aa1c87e163222b7
---
 .../com/android/server/wm/WindowContextListenerController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/WindowContextListenerController.java b/services/core/java/com/android/server/wm/WindowContextListenerController.java
index 8b08314136d4c..f9c4ad749d801 100644
--- a/services/core/java/com/android/server/wm/WindowContextListenerController.java
+++ b/services/core/java/com/android/server/wm/WindowContextListenerController.java
@@ -227,7 +227,7 @@ class WindowContextListenerController {
         }
 
         @Override
-        public void onRequestedOverrideConfigurationChanged(Configuration overrideConfiguration) {
+        public void onMergedOverrideConfigurationChanged(Configuration mergedOverrideConfig) {
             reportConfigToWindowTokenClient();
         }