Fix incorrect notification text is displayed for video call in dialing

"Ongoing video call" is displayed in dialing state on the notification.
But "Dialing" should be displayed.

Wrong order of condition to decide the text causes this issue. It should
have checked dialing state before checking video call state.

To resolve this issue, check the dialing sate at first and then, check
the video call sate.

Bug: 111424745
Test: manual - Checked "Dialing" is displayed if it is dialing state.
Change-Id: Id03909178370df3cc4905699f46e13f9a39aeb45

1 files changed, 2 insertions, 2 deletions

diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java
index 8316d76ee..99ff7255e 100644
--- a/java/com/android/incallui/StatusBarNotifier.java
+++ b/java/com/android/incallui/StatusBarNotifier.java
@@ -709,13 +709,13 @@ public class StatusBarNotifier
       }
     } else if (call.getState() == DialerCallState.ONHOLD) {
       resId = R.string.notification_on_hold;
+    } else if (DialerCallState.isDialing(call.getState())) {
+      resId = R.string.notification_dialing;
     } else if (call.isVideoCall()) {
       resId =
           call.getVideoTech().isPaused()
               ? R.string.notification_ongoing_paused_video_call
               : R.string.notification_ongoing_video_call;
-    } else if (DialerCallState.isDialing(call.getState())) {
-      resId = R.string.notification_dialing;
     } else if (call.getVideoTech().getSessionModificationState()
         == SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST) {
       resId = R.string.notification_requesting_video_call;