commit 1ac55a147248fb28ceebc84716095788694a6bab
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 20 20:36:29 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 20 20:36:29 2018 +0000
tree 0bb982aa374be3b0cf11149a151f0dd252647e22
parent 6125ea192e3abf09024dcc272502ab751399fb58
parent 1f4857459c1dd5d1d3fcd2fb94bb080c388723c7

Merge "Take in to account video upgrade requests in some circumstances."

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 */