commit b9d447c6d1088134354d5bacaa9f95bd8ab9af53
author Garik Badalyan <garikb@codeaurora.org> Fri Apr 08 15:19:10 2016 -0700
committer Tyler Gunn <tgunn@google.com> Wed May 04 17:39:22 2016 +0000
tree 6ee1cc5f7929ad7a77076718088c829dd05eba74
parent 9bb027e7dc557645b87a02981dd794f6267fa4b1

IMS-VT: Show upgrade to video notification.

Upgrade to video notification is not shown
when UE's screen is on and InCallUI is not
visible, e.g. pushed to backgroud by pressing
the Home button.

CL: 121482384
BUG=28093622
Change-Id: Ia141886b7a085164b3294a682f14b60b7a2a83b4

InCallUI/src/com/android/incallui/StatusBarNotifier.java

diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
index 7d212aa..a616203 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -247,8 +247,11 @@
                 getContentString(call, contactInfo.userType);
         final String contentTitle = getContentTitle(contactInfo, call);
 
+        final boolean isVideoUpgradeRequest = call.getSessionModificationState()
+                == Call.SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST;
         final int notificationType;
-        if (callState == Call.State.INCOMING || callState == Call.State.CALL_WAITING) {
+        if (callState == Call.State.INCOMING || callState == Call.State.CALL_WAITING
+                || isVideoUpgradeRequest) {
             notificationType = NOTIFICATION_INCOMING_CALL;
         } else {
             notificationType = NOTIFICATION_IN_CALL;
@@ -301,8 +304,6 @@
         builder.setLargeIcon(largeIcon);
         builder.setColor(mContext.getResources().getColor(R.color.dialer_theme_color));
 
-        final boolean isVideoUpgradeRequest = call.getSessionModificationState()
-                == Call.SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST;
         if (isVideoUpgradeRequest) {
             builder.setUsesChronometer(false);
             addDismissUpgradeRequestAction(builder);