Pass through video state when answering a call.
Bug: 16013878
Bug: 16015750
Change-Id: I26af541c30cc296bb3b3f85c06a2e097d0b58547
diff --git a/src/com/android/telecomm/CallsManager.java b/src/com/android/telecomm/CallsManager.java
index 8265b20..c752625 100644
--- a/src/com/android/telecomm/CallsManager.java
+++ b/src/com/android/telecomm/CallsManager.java
@@ -344,8 +344,11 @@
* Instructs Telecomm to answer the specified call. Intended to be invoked by the in-call
* app through {@link InCallAdapter} after Telecomm notifies it of an incoming call followed by
* the user opting to answer said call.
+ *
+ * @param call The call to answer.
+ * @param videoState The video state in which to answer the call.
*/
- void answerCall(Call call) {
+ void answerCall(Call call, int videoState) {
if (!mCalls.contains(call)) {
Log.i(this, "Request to answer a non-existent call %s", call);
} else {
@@ -368,7 +371,7 @@
// We do not update the UI until we get confirmation of the answer() through
// {@link #markCallAsActive}.
- call.answer();
+ call.answer(videoState);
}
}
@@ -577,7 +580,7 @@
mCallAudioManager.toggleMute();
return true;
} else {
- ringingCall.answer();
+ ringingCall.answer(ringingCall.getVideoState());
return true;
}
} else if (HeadsetMediaButton.LONG_PRESS == type) {