diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-04-06 23:16:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-06 23:16:42 +0000 |
| commit | 28188020060d1ad3304dfa0367486ff5bb35da62 (patch) | |
| tree | 8d08d4f2292aa84dc435d455891e7ab633d95a25 /java/com/android/incallui/VideoCallPresenter.java | |
| parent | 34e183cfd77f68e0ade42d2080c76f54a319430d (diff) | |
| parent | 01a86435499d66b267765f89b7dd9c83c158ddfe (diff) | |
Update AOSP Dialer source from internal google3 repository at cl/152373142. am: d8046e520a
am: 01a8643549
Change-Id: Ib92542e6b88bc8d8906982280244661ed7dbca8f
Diffstat (limited to 'java/com/android/incallui/VideoCallPresenter.java')
| -rw-r--r-- | java/com/android/incallui/VideoCallPresenter.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/java/com/android/incallui/VideoCallPresenter.java b/java/com/android/incallui/VideoCallPresenter.java index 5d2138ee0..31999ef2e 100644 --- a/java/com/android/incallui/VideoCallPresenter.java +++ b/java/com/android/incallui/VideoCallPresenter.java @@ -154,8 +154,8 @@ public class VideoCallPresenter /** * Determines if the incoming video surface should be shown based on the current videoState and - * callState. The video surface is shown when incoming video is not paused, the call is active, - * and video reception is enabled. + * callState. The video surface is shown when incoming video is not paused, the call is active or + * dialing and video reception is enabled. * * @param videoState The current video state. * @param callState The current call state. @@ -168,8 +168,13 @@ public class VideoCallPresenter boolean isPaused = VideoProfile.isPaused(videoState); boolean isCallActive = callState == DialerCall.State.ACTIVE; + //Show incoming Video for dialing calls to support early media + boolean isCallOutgoingPending = + DialerCall.State.isDialing(callState) || callState == DialerCall.State.CONNECTING; - return !isPaused && isCallActive && VideoProfile.isReceptionEnabled(videoState); + return !isPaused + && (isCallActive || isCallOutgoingPending) + && VideoProfile.isReceptionEnabled(videoState); } /** |