Merge "Unregister configuration listener after the WindowProcessController was disallowed to be overridden." am: e563bef9fd am: 303b28a9c6 am: d2994c166d am: e0a2459ced

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1839893

Change-Id: Ifee46ea9747dc601e3afb5d4130d3bbce3c62231

1 files changed, 2 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/wm/WindowProcessController.java b/services/core/java/com/android/server/wm/WindowProcessController.java
index af386419d455..81878e3ef229 100644
--- a/services/core/java/com/android/server/wm/WindowProcessController.java
+++ b/services/core/java/com/android/server/wm/WindowProcessController.java
@@ -1559,7 +1559,9 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
                 // activity as it could lead to incorrect display metrics. For ex, IME services
                 // expect their config to match the config of the display with the IME window
                 // showing.
+                // If the configuration has been overridden by previous activity, empty it.
                 mIsActivityConfigOverrideAllowed = false;
+                unregisterActivityConfigurationListener();
                 break;
             default:
                 break;