commit e7eddd946a6517163bd0d3baaa643e7e18043373
author Yorke Lee <yorkelee@google.com> Mon Oct 19 21:19:49 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 19 21:19:49 2015 +0000
tree 0c091e8bf4731d239029c39c1647a1e82693579c
parent 177debf2b4fa56d855107ec53378712770a01f25
parent 3a576b7ab31275801064d2e1875b5fe8e06ea612

am 3a576b7a: Fix bitmap leaks in InCallUI am: 24ad92950a

* commit '3a576b7ab31275801064d2e1875b5fe8e06ea612':
  Fix bitmap leaks in InCallUI

src/com/android/incallui/StatusBarNotifier.java

diff --git a/src/com/android/incallui/StatusBarNotifier.java b/src/com/android/incallui/StatusBarNotifier.java
index a9b6ccc..4d4e349 100644
--- a/src/com/android/incallui/StatusBarNotifier.java
+++ b/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();