summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-10-12 20:21:25 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-10-12 20:21:25 +0000
commit1634e8180fabca46d5c421119dd9f69a774693dc (patch)
tree0f590b9161c3ea66eacc0632a6c84842f5397533
parent91952f32ff41025061b994ff09dda175071fa7a6 (diff)
parent706e4ae1eb1a3d3c026724afae89c3c749f8b1c7 (diff)
Merge "Fix incorrect notification text is displayed for video call in dialing"
-rw-r--r--java/com/android/incallui/StatusBarNotifier.java4
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;