commit bd71ddc59b0988a69e960c200c95d92b6ee22f88
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 30 03:00:43 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 30 03:00:43 2021 +0000
tree 248868f82cacba8961e3a8cc14151bc57a066460
parent 6cab6458d64dd2c21b994148d21f9313e63576a9
parent 9cfd6a616419e48a9aa4d678c12cbb06f367098f

Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3 am: f5876a1df9 am: 9cfd6a6164

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501

Change-Id: I9d3f933e3fa5c68e34e97f9b4191022c5d0aee8b

src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java

diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
index 25d1cda..e5bd449 100644
--- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
@@ -54,8 +54,8 @@
     private boolean mIsExpanded;
 
     public ConditionContextualCardController(Context context) {
-        mContext = context;
-        mConditionManager = new ConditionManager(context.getApplicationContext(), this);
+        mContext = context.getApplicationContext();
+        mConditionManager = new ConditionManager(mContext, this);
         mConditionManager.startMonitoringStateChange();
     }