| commit | ec1c7d3b85ff5525e4d6e6c9e3ff0495879c7df8 | [log] [tgz] |
|---|---|---|
| author | erfanian <erfanian@google.com> | Wed Jun 20 13:51:17 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 20 13:51:17 2018 -0700 |
| tree | e2db2d77262c837d7668aff69acb5cf61829e91d | |
| parent | 8a58085aa08bcf7c820e374e433ee27b1a2768dc [diff] | |
| parent | 7a89f57e2ba1bdb9f4226968562eb3efcf1bca8f [diff] |
Merge "Take in to account video upgrade requests in some circumstances." am: 1ac55a1472 am: 7a89f57e2b Change-Id: Ibf3616608fbc3cc6a2a0f390bd0dc57a9b90c7b9
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 */