summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorerfanian <erfanian@google.com>2018-06-20 11:56:25 -0700
committerCopybara-Service <copybara-piper@google.com>2018-06-20 12:25:50 -0700
commit1f4857459c1dd5d1d3fcd2fb94bb080c388723c7 (patch)
tree0bb982aa374be3b0cf11149a151f0dd252647e22 /java
parent0509a47f6ae36fcf40c04bc5b5927cade4c8709b (diff)
Take in to account video upgrade requests in some circumstances.
Test: manual PiperOrigin-RevId: 201390999 Change-Id: Ifa4b124d0d94d97f2aa1d3675130c7eef1f289c1
Diffstat (limited to 'java')
-rw-r--r--java/com/android/incallui/call/DialerCall.java3
1 files changed, 2 insertions, 1 deletions
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 */