commit 70e04c1413b4bdfadbe6443db0ce97b7d2df69a3
author Qiong Liu <qiong.xb.liu@sony.com> Fri Oct 12 13:47:21 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 12 13:47:21 2018 -0700
tree 0f590b9161c3ea66eacc0632a6c84842f5397533
parent ced47b2882e2fb9ef7dfacb1936b877e41baf7b5
parent 2331c8ceb9acf624a9e6d8e92569ab5af41a813c

Merge "Fix incorrect notification text is displayed for video call in dialing" am: 1634e8180f
am: 2331c8ceb9

Change-Id: I01d1e25fdbe8cfbade72757becfc9516f04357ff

java/com/android/incallui/StatusBarNotifier.java

diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java
index 8316d76..99ff725 100644
--- a/java/com/android/incallui/StatusBarNotifier.java
+++ b/java/com/android/incallui/StatusBarNotifier.java
@@ -709,13 +709,13 @@
       }
     } 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;