commit 1f4857459c1dd5d1d3fcd2fb94bb080c388723c7
author erfanian <erfanian@google.com> Wed Jun 20 11:56:25 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Jun 20 12:25:50 2018 -0700
tree 0bb982aa374be3b0cf11149a151f0dd252647e22
parent 0509a47f6ae36fcf40c04bc5b5927cade4c8709b

Take in to account video upgrade requests in some circumstances.

Test: manual
PiperOrigin-RevId: 201390999
Change-Id: Ifa4b124d0d94d97f2aa1d3675130c7eef1f289c1

java/com/android/incallui/call/DialerCall.java

diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java
index dd6c25b..fc22762 100644
--- a/java/com/android/incallui/call/DialerCall.java
+++ b/java/com/android/incallui/call/DialerCall.java
@@ -1730,7 +1730,8 @@
         && !isActiveRttCall()
         && !isConferenceCall()
         && !isVideoCall()
-        && !isVoiceMailNumber();
+        && !isVoiceMailNumber()
+        && !hasReceivedVideoUpgradeRequest();
   }
 
   /** Indicates the user has selected SpeakEasy */