commit | 5b7193d5686a86dd2c4776355e7efdbdd5a48f6a | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Dec 13 02:35:22 2018 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 13 02:35:22 2018 +0000 |
tree | 4c0b473c07c11961aef12b46cd685bd81351055e | |
parent | 4e4ebfffed3747f1653c2e7e70d1058c85b0a8e7 [diff] | |
parent | 3a77f2833274405c5983fcd0a47b957b34c18dcf [diff] |
Merge "Unregister configuration listener when remove container"
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index e0d3fbe..8624bff 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -746,6 +746,9 @@ @Override void removeImmediately() { onRemovedFromDisplay(); + if (mActivityRecord != null) { + mActivityRecord.unregisterConfigurationChangeListener(this); + } super.removeImmediately(); }
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 69d9810..b10fd31 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java
@@ -201,6 +201,9 @@ if (DEBUG_STACK) Slog.i(TAG, "removeTask: removing taskId=" + mTaskId); EventLog.writeEvent(WM_TASK_REMOVED, mTaskId, "removeTask"); mDeferRemoval = false; + if (mTaskRecord != null) { + mTaskRecord.unregisterConfigurationChangeListener(this); + } super.removeImmediately(); }