commit f5876a1df9a4063cb72a052f922f7896acf14ca8
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 30 02:35:23 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 30 02:35:23 2021 +0000
tree 95c41f6a6b75785cd50d72b951a14880b4571f17
parent b515d34c40ba7b4bd9d37fdb781085ab7aa09ccc
parent 060bf953e39b3310c04a0440acf702aeb691207c

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

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

Change-Id: I818ae58baa161689a867cea8bc4662db602dfdcb

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