diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-12-03 19:37:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-03 19:37:31 +0000 |
| commit | f7f7a4f9165aa36be8b8db6597613a9f1ecbdeb6 (patch) | |
| tree | 8cbe5ef25db122c8669e9e2493e88f02fdf98388 | |
| parent | 56688065dd74cc6a254d3dff7769dd59b541432c (diff) | |
| parent | f4465bb279df51bea29bb09e42b3ac54d486d609 (diff) | |
Merge "Don't cancel incall notification unnecessarily" into lmp-mr1-dev
| -rw-r--r-- | InCallUI/src/com/android/incallui/StatusBarNotifier.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java index a4cea2322..5eaf1080f 100644 --- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java +++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java @@ -148,8 +148,10 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener { * @see #updateInCallNotification(InCallState,CallList) */ private void cancelInCall() { - Log.d(this, "cancelInCall()..."); - mNotificationManager.cancel(IN_CALL_NOTIFICATION); + if (mIsShowingNotification) { + Log.d(this, "cancelInCall()..."); + mNotificationManager.cancel(IN_CALL_NOTIFICATION); + } mIsShowingNotification = false; } |