Update AOSP Dialer source from internal google3 repository at
cl/160679286.
Test: make, treehugger
This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/159771812 (6/22/2017) to 160679286 (6/30/2017).
These changes track the dialer V11 release.
This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Change-Id: I7e7b41ce472b85a9d5a6728d5c8b3c045c09e095
Merged-In: Ie2eb735a92c577b5ae5a5e8b7efa2d699fc964bc
diff --git a/java/com/android/incallui/VideoPauseController.java b/java/com/android/incallui/VideoPauseController.java
index 2595e2f..36c9ef3 100644
--- a/java/com/android/incallui/VideoPauseController.java
+++ b/java/com/android/incallui/VideoPauseController.java
@@ -66,11 +66,6 @@
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 @@
}
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);