commit 38931d0ad60f00a9f50c90cef446166731f0b871
author Andrew Lee <anwlee@google.com> Wed Jul 16 10:17:36 2014 -0700
committer Andrew Lee <anwlee@google.com> Thu Jul 17 13:14:47 2014 -0700
tree 206352d45ff8467ac98d78bc10e5bf99200386b0
parent 9a4bc77f89c4fac3c08581acee67377c2714be21

Pass through video state when answering a call.

Bug: 16013878
Bug: 16015750
Change-Id: I26af541c30cc296bb3b3f85c06a2e097d0b58547

src/com/android/telecomm/Call.java

diff --git a/src/com/android/telecomm/Call.java b/src/com/android/telecomm/Call.java
index 5dfba52..b06b043 100644
--- a/src/com/android/telecomm/Call.java
+++ b/src/com/android/telecomm/Call.java
@@ -669,8 +669,10 @@
 
     /**
      * Answers the call if it is ringing.
+     *
+     * @param videoState The video state in which to answer the call.
      */
-    void answer() {
+    void answer(int videoState) {
         Preconditions.checkNotNull(mConnectionService);
 
         // Check to verify that the call is still in the ringing state. A call can change states
@@ -680,7 +682,7 @@
             // that it will work. Instead, we wait until confirmation from the connectino service
             // that the call is in a non-RINGING state before changing the UI. See
             // {@link ConnectionServiceAdapter#setActive} and other set* methods.
-            mConnectionService.answer(this);
+            mConnectionService.answer(this, videoState);
         }
     }