summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-10-19 21:14:57 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-19 21:14:57 +0000
commit3a576b7ab31275801064d2e1875b5fe8e06ea612 (patch)
tree3e5b3f50bdc2807bcb086398d5fb6d476bbbd9bd
parent9849b29079f43a29e65886b0d26d2a07344b8d2a (diff)
parent24ad92950a39af862c676f18e07b88ecde2f4e3b (diff)
downloadInCallUI-3a576b7ab31275801064d2e1875b5fe8e06ea612.tar.gz
Fix bitmap leaks in InCallUI
am: 24ad92950a * commit '24ad92950a39af862c676f18e07b88ecde2f4e3b': Fix bitmap leaks in InCallUI
-rw-r--r--src/com/android/incallui/StatusBarNotifier.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/incallui/StatusBarNotifier.java b/src/com/android/incallui/StatusBarNotifier.java
index a9b6cccb..4d4e3493 100644
--- a/src/com/android/incallui/StatusBarNotifier.java
+++ b/src/com/android/incallui/StatusBarNotifier.java
@@ -118,6 +118,10 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener,
* @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 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener,
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();