commit 256a0f4490b8a4f4734f7db2c59114a3d4698ce2
author Yorke Lee <yorkelee@google.com> Mon Oct 19 11:44:46 2015 -0700
committer Yorke Lee <yorkelee@google.com> Mon Oct 19 13:56:16 2015 -0700
tree 77e35c65d4b0294f7b84162d2a8ef3a22fbaed2a
parent 959f64ca92f343f5d86db2c7233da47e6c4b55b7

DO NOT MERGE Fix bitmap leaks in InCallUI

Fix the bitmap leaks in InCallUI that were a result of
StatusBarNotifier instances being retained across calls.

Bitmap -> StatusBarNotifier -> CallUpdateListenerMap ->
CallList

Bug: 25003292
Change-Id: I4f8695d7dfbc397b0fee0305a6f94e8d2e8e593f

InCallUI/src/com/android/incallui/StatusBarNotifier.java

diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
index d1509b8..76a95f1 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -117,6 +117,10 @@
      * @see #updateInCallNotification(InCallState,CallList)
      */
     private void cancelNotification() {
+        if (!TextUtils.isEmpty(mCallId)) {
+            CallList.getInstance().removeCallUpdateListener(mCallId, this);
+            mCallId = null;
+        }
         if (mCurrentNotification != NOTIFICATION_NONE) {
             Log.d(this, "cancelInCall()...");
             mNotificationManager.cancel(mCurrentNotification);
@@ -160,7 +164,7 @@
         final boolean isIncoming = (call.getState() == Call.State.INCOMING ||
                 call.getState() == Call.State.CALL_WAITING);
 
-        if (mCallId != null) {
+        if (!TextUtils.isEmpty(mCallId)) {
             CallList.getInstance().removeCallUpdateListener(mCallId, this);
         }
         mCallId = call.getId();