diff options
| author | roldenburg <roldenburg@google.com> | 2017-06-23 17:03:57 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-06-26 09:08:13 -0700 |
| commit | 4b499669dde98f485199fd38883ad0dc26d1f0f3 (patch) | |
| tree | 69d617e473b7542599aea32df2b331852c43d1ca /java/com/android/incallui/VideoPauseController.java | |
| parent | 059d2e2a9ef121edfbd0596cf0f8c22b167a7b8d (diff) | |
Fix pause / unpause in the scenario where calls are swapped
The previous fix (cl/159623587) has a regression in this scenario:
Device A: video call Device B
Device B: accept video call
Device B: go into background (press Home)
Device A: go into background (press Home)
Device B: return to foreground (return to call)
Unexpected result: A is transmitting video even though it has not returned to the foreground as well
Bug: 62784036,38359325
Test: manual
PiperOrigin-RevId: 160013824
Change-Id: I6e9c89c8fa52882c49d32e061032b93b1e8552f0
Diffstat (limited to 'java/com/android/incallui/VideoPauseController.java')
| -rw-r--r-- | java/com/android/incallui/VideoPauseController.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/java/com/android/incallui/VideoPauseController.java b/java/com/android/incallui/VideoPauseController.java index 2595e2f8b..36c9ef350 100644 --- a/java/com/android/incallui/VideoPauseController.java +++ b/java/com/android/incallui/VideoPauseController.java @@ -66,11 +66,6 @@ class VideoPauseController implements InCallStateListener, IncomingCallListener return sVideoPauseController; } - private boolean wasIncomingCall() { - return (mPrevCallState == DialerCall.State.CALL_WAITING - || mPrevCallState == DialerCall.State.INCOMING); - } - /** * Determines if a call is in incoming/waiting state. * @@ -198,7 +193,7 @@ class VideoPauseController implements InCallStateListener, IncomingCallListener } final boolean canVideoPause = videoCanPause(call); - if ((wasIncomingCall() || wasDialing()) && canVideoPause && !mIsInBackground) { + if (canVideoPause && !mIsInBackground) { // Send resume request for the active call, if user rejects incoming call, ends dialing // call, or the call was previously in a paused state and UI is in the foreground. sendRequest(call, true); |