Merge "IMS-VT: Set notificationType for IncomingCall when InCallUi is not showing" into atel.lnx.2.0-dev
diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
index 8c09ff3..d088594 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -339,9 +339,12 @@
final boolean isVideoUpgradeRequest = call.getSessionModificationState()
== Call.SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST;
+ final Call pendingAccountSelectionCall = CallList.getInstance()
+ .getWaitingForAccountCall();
final int notificationType;
- if (callState == Call.State.INCOMING || callState == Call.State.CALL_WAITING
- || isVideoUpgradeRequest) {
+ if ((callState == Call.State.INCOMING || callState == Call.State.CALL_WAITING
+ || isVideoUpgradeRequest) && (!InCallPresenter.getInstance().isShowingInCallUi()
+ || pendingAccountSelectionCall != null)) {
notificationType = NOTIFICATION_INCOMING_CALL;
} else {
notificationType = NOTIFICATION_IN_CALL;
@@ -388,8 +391,6 @@
// Set up the main intent to send the user to the in-call screen
final PendingIntent inCallPendingIntent = createLaunchPendingIntent();
builder.setContentIntent(inCallPendingIntent);
- final Call pendingAccountSelectionCall = CallList.getInstance()
- .getWaitingForAccountCall();
// Set the intent as a full screen intent as well if a call is incoming
if (notificationType == NOTIFICATION_INCOMING_CALL