diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-12-03 19:50:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 19:50:35 +0000 |
| commit | 5c607eeda11fc41c584bf30e22b60fc27d048efb (patch) | |
| tree | 8cbe5ef25db122c8669e9e2493e88f02fdf98388 | |
| parent | 03ddafca2953667e812803a7a9e682e8d0d05ad0 (diff) | |
| parent | f7f7a4f9165aa36be8b8db6597613a9f1ecbdeb6 (diff) | |
am 3d512ad6: Merge "Don\'t cancel incall notification unnecessarily" into lmp-mr1-dev
* commit '3d512ad663cb2bf503f6fecbbc570d751a461998':
Don't cancel incall notification unnecessarily
| -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; } |