commit 9cfd6a616419e48a9aa4d678c12cbb06f367098f
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 30 02:45:06 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 30 02:45:06 2021 +0000
tree 290c4980bb01dd5c9ee86e38c786e60516118ea1
parent 21ef1830eacbe5e95f026b91d8921e2cae009702
parent f5876a1df9a4063cb72a052f922f7896acf14ca8

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

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

Change-Id: I9966577fec0160fb4c13cde9cfcf7bf8d7b5697d

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();
     }