commit d8c2ac02a65ea28915d8990c005a395ae6d762a2
author Garik Badalyan <garikb@codeaurora.org> Fri May 06 15:57:22 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 06 15:57:22 2016 +0000
tree 30a1d59e9d111acdea1a6ccab20d77feada10f51
parent 9b8e50f60f8e4f5f73be111f32394b3621ca34f9
parent 8b25d786674f95034dfcdfff09ea16f8e3869311

Merge "IMS-VT: Show upgrade to video notification." into nyc-mr1-dev
am: 8b25d78667

* commit '8b25d786674f95034dfcdfff09ea16f8e3869311':
  IMS-VT: Show upgrade to video notification.

Change-Id: Ibcd1c5a940cc0bf96e1d950cd6457dccfc562486

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);