commit 12b21e7d56d8132f3e550bf3b44933726af6e9d3
author Yorke Lee <yorkelee@google.com> Mon Oct 19 21:14:57 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 19 21:14:57 2015 +0000
tree 1d1699b3c8c2e63fdde790997d66459df43c0fc4
parent 785f157fe125ce913223aa0b0415b4eed8e6090c
parent aee0b35436a0920a5cccd1491179737aebf33965

Fix bitmap leaks in InCallUI
am: 24ad92950a

* commit '24ad92950a39af862c676f18e07b88ecde2f4e3b':
  Fix bitmap leaks in InCallUI

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 a9b6ccc..4d4e349 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -118,6 +118,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);
@@ -161,7 +165,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();