diff options
| author | Chris Li <lihongyu@google.com> | 2021-10-23 01:41:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-23 01:41:10 +0000 |
| commit | e563bef9fd45a7235714e492e3cbdd52755db7b6 (patch) | |
| tree | 0cf41d3c4b6a5caec9c9822b8906cea48b888604 | |
| parent | 0f7d293cd876b8126d0fb73640655b7bb8681711 (diff) | |
| parent | 438068802de13a2ee1a43aa21addbd42d05ae84a (diff) | |
| download | base-e563bef9fd45a7235714e492e3cbdd52755db7b6.tar.gz | |
Merge "Unregister configuration listener after the WindowProcessController was disallowed to be overridden."
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowProcessController.java | 2 |
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 5540cc567ed2..4857fb3faa76 100644 --- a/services/core/java/com/android/server/wm/WindowProcessController.java +++ b/services/core/java/com/android/server/wm/WindowProcessController.java @@ -1547,7 +1547,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; |