diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-06-20 20:36:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-20 20:36:29 +0000 |
| commit | 1ac55a147248fb28ceebc84716095788694a6bab (patch) | |
| tree | 0bb982aa374be3b0cf11149a151f0dd252647e22 /java | |
| parent | 6125ea192e3abf09024dcc272502ab751399fb58 (diff) | |
| parent | 1f4857459c1dd5d1d3fcd2fb94bb080c388723c7 (diff) | |
Merge "Take in to account video upgrade requests in some circumstances."
Diffstat (limited to 'java')
| -rw-r--r-- | java/com/android/incallui/call/DialerCall.java | 3 |
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 */ |