Update AOSP Dialer source from internal google3 repository at
cl/158012278.
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/152373142 (4/06/2017) to cl/158012278 (6/05/2017).
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.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.
Change-Id: I4d3f14b5140e2e51bead9497bc118a205b3ebe76
diff --git a/java/com/android/incallui/AnswerScreenPresenter.java b/java/com/android/incallui/AnswerScreenPresenter.java
index ca34aa6..ddbe6cc 100644
--- a/java/com/android/incallui/AnswerScreenPresenter.java
+++ b/java/com/android/incallui/AnswerScreenPresenter.java
@@ -124,12 +124,29 @@
LogUtil.i("AnswerScreenPresenter.onAnswerAndReleaseCall", "activeCall == null");
onAnswer(false);
} else {
+ activeCall.setReleasedByAnsweringSecondCall(true);
activeCall.addListener(new AnswerOnDisconnected(activeCall));
activeCall.disconnect();
}
}
@Override
+ public void onAnswerAndReleaseButtonDisabled() {
+ DialerCall activeCall = CallList.getInstance().getActiveCall();
+ if (activeCall != null) {
+ activeCall.increaseSecondCallWithoutAnswerAndReleasedButtonTimes();
+ }
+ }
+
+ @Override
+ public void onAnswerAndReleaseButtonEnabled() {
+ DialerCall activeCall = CallList.getInstance().getActiveCall();
+ if (activeCall != null) {
+ activeCall.increaseAnswerAndReleaseButtonDisplayedTimes();
+ }
+ }
+
+ @Override
public void onCannedTextResponsesLoaded(DialerCall call) {
if (isSmsResponseAllowed(call)) {
answerScreen.setTextResponses(call.getCannedSmsResponses());
@@ -183,6 +200,9 @@
@Override
public void onInternationalCallOnWifi() {}
+
+ @Override
+ public void onEnrichedCallSessionUpdate() {}
}
private boolean isSmsResponseAllowed(DialerCall call) {