commit d8f18c0f1620a8ce672744c78884a5d0cfeeab02
author Fabian Kozynski <kozynski@google.com> Fri Sep 17 10:10:10 2021 -0400
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Dec 24 23:03:58 2021 +0000
tree b034fa4a1ef5bba4b12a727f1cc529b9423c14ef
parent cebf5c06997b64f4e47a1611edb5f97044509d76

Prevent nesting of ContextThemeWrapper

brightness_mirror_container sets android:theme, causing the inflating
context to be wrapped in a ContextThemeWrapper every time it's
reinflated (because we used the old view context).

Instead, use the context of the parent for reinflation (same context
every time), so we only have one layer or theming.

Fixes: 200054259
Test: manual, dump heap after triggering reinflate many times
Change-Id: I0af5648bfc8b20dc53cb0a9064eb7b93d1f10941
(cherry picked from commit 04a442e53639efcac948c36947c798d679d3279c)
Merged-In:I0af5648bfc8b20dc53cb0a9064eb7b93d1f10941

packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java
index a0edc7c..1e52511 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java
@@ -149,7 +149,7 @@
     private void reinflate() {
         int index = mStatusBarWindow.indexOfChild(mBrightnessMirror);
         mStatusBarWindow.removeView(mBrightnessMirror);
-        mBrightnessMirror = (FrameLayout) LayoutInflater.from(mBrightnessMirror.getContext())
+        mBrightnessMirror = (FrameLayout) LayoutInflater.from(mStatusBarWindow.getContext())
                 .inflate(R.layout.brightness_mirror_container, mStatusBarWindow, false);
         mToggleSliderController = setMirrorLayout();
         mStatusBarWindow.addView(mBrightnessMirror, index);