Merge "Dereference cached Bitmaps in EventLogger" into oc-dev

1 files changed, 7 insertions, 0 deletions

diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/telecom/Call.java
index d678020ed..ecdf1057f 100644
--- a/src/com/android/server/telecom/Call.java
+++ b/src/com/android/server/telecom/Call.java
@@ -578,6 +578,13 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable {
     }
 
     public void destroy() {
+        // We should not keep these bitmaps around because the Call objects may be held for logging
+        // purposes.
+        // TODO: Make a container object that only stores the information we care about for Logging.
+        if (mCallerInfo != null) {
+            mCallerInfo.cachedPhotoIcon = null;
+            mCallerInfo.cachedPhoto = null;
+        }
         Log.addEvent(this, LogUtils.Events.DESTROYED);
     }