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