From 1f4857459c1dd5d1d3fcd2fb94bb080c388723c7 Mon Sep 17 00:00:00 2001
From: erfanian <erfanian@google.com>
Date: Wed, 20 Jun 2018 11:56:25 -0700
Subject: 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java
index dd6c25b5b..fc2276232 100644
--- a/java/com/android/incallui/call/DialerCall.java
+++ b/java/com/android/incallui/call/DialerCall.java
@@ -1730,7 +1730,8 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa
         && !isActiveRttCall()
         && !isConferenceCall()
         && !isVideoCall()
-        && !isVoiceMailNumber();
+        && !isVoiceMailNumber()
+        && !hasReceivedVideoUpgradeRequest();
   }
 
   /** Indicates the user has selected SpeakEasy */
-- 
cgit v1.2.3