From f0a3736644b057198877e2280474aec8b99d1281 Mon Sep 17 00:00:00 2001
From: Guojing Yuan <guojing@google.com>
Date: Fri, 5 Nov 2021 17:52:14 +0000
Subject: [PATCH] Fix CDM memory leak for activity context

Fix: 195968760

Test: N/A
Change-Id: Ibbba40a64cd20ecc11e287c2bfd3afdb179a7a52
---
 core/java/android/companion/CompanionDeviceManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/companion/CompanionDeviceManager.java b/core/java/android/companion/CompanionDeviceManager.java
index b99ad5125149e..32c491753af47 100644
--- 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;
             }
         }