Merge "Fix CDM memory leak for activity context" into sc-v2-dev

2021-11-08 18:58:54 +00:00
parent c3ef628c75 f0a3736644
commit 6ebf85244c
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/companion/CompanionDeviceManager.java
+++ b/core/java/android/companion/CompanionDeviceManager.java
@@ -108,7 +108,7 @@ public final class CompanionDeviceManager {
    }

    private final ICompanionDeviceManager mService;
-    private final Context mContext;
+    private Context mContext;

    /** @hide */
    public CompanionDeviceManager(
@@ -541,6 +541,7 @@ public final class CompanionDeviceManager {
                mCallback = null;
                mHandler = null;
                mRequest = null;
+                mContext = null;
            }
        }