diff options
| author | Hall Liu <hallliu@google.com> | 2015-11-11 21:45:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-11 21:45:15 +0000 |
| commit | abdddba0913a39a90f22237d66992c167b3b5337 (patch) | |
| tree | 5481a108f37d16684327ac7f4864b6bc6efa953c /InCallUI | |
| parent | 03c1aaeed8721e3a83541e6dee79413404a00bb0 (diff) | |
| parent | 762ed8f1b0716eda3e9bcace78ac8beb1f2cf5c6 (diff) | |
Fix incorrect in-call notification
am: 295f8afcbc
* commit '295f8afcbc89815dadb66823a7c1ef3a894887b8':
Fix incorrect in-call notification
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/StatusBarNotifier.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java index 86674449d..1f2729ea3 100644 --- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java +++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java @@ -225,9 +225,7 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener, final String contentTitle = getContentTitle(contactInfo, call); final int notificationType; - if ((state == Call.State.INCOMING - || state == Call.State.CALL_WAITING) && - !InCallPresenter.getInstance().isShowingInCallUi()) { + if (state == Call.State.INCOMING || state == Call.State.CALL_WAITING) { notificationType = NOTIFICATION_INCOMING_CALL; } else { notificationType = NOTIFICATION_IN_CALL; @@ -252,7 +250,8 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener, builder.setContentIntent(inCallPendingIntent); // Set the intent as a full screen intent as well if a call is incoming - if (notificationType == NOTIFICATION_INCOMING_CALL) { + if (notificationType == NOTIFICATION_INCOMING_CALL + && !InCallPresenter.getInstance().isShowingInCallUi()) { configureFullScreenIntent(builder, inCallPendingIntent, call); // Set the notification category for incoming calls builder.setCategory(Notification.CATEGORY_CALL); |