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/InCallAdapter.java

diff --git a/src/com/android/telecomm/InCallAdapter.java b/src/com/android/telecomm/InCallAdapter.java
index 161d4a4..0822dc4 100644
--- a/src/com/android/telecomm/InCallAdapter.java
+++ b/src/com/android/telecomm/InCallAdapter.java
@@ -50,14 +50,21 @@
         public void handleMessage(Message msg) {
             Call call;
             switch (msg.what) {
-                case MSG_ANSWER_CALL:
-                    call = mCallIdMapper.getCall(msg.obj);
-                    if (call != null) {
-                        mCallsManager.answerCall(call);
-                    } else {
-                        Log.w(this, "answerCall, unknown call id: %s", msg.obj);
+                case MSG_ANSWER_CALL: {
+                    SomeArgs args = (SomeArgs) msg.obj;
+                    try {
+                        call = mCallIdMapper.getCall(args.arg1);
+                        int videoState = (int) args.arg2;
+                        if (call != null) {
+                            mCallsManager.answerCall(call, videoState);
+                        } else {
+                            Log.w(this, "answerCall, unknown call id: %s", msg.obj);
+                        }
+                    } finally {
+                        args.recycle();
                     }
                     break;
+                }
                 case MSG_REJECT_CALL: {
                     SomeArgs args = (SomeArgs) msg.obj;
                     try {
@@ -192,10 +199,13 @@
     }
 
     @Override
-    public void answerCall(String callId) {
-        Log.d(this, "answerCall(%s)", callId);
+    public void answerCall(String callId, int videoState) {
+        Log.d(this, "answerCall(%s,%d)", callId, videoState);
         mCallIdMapper.checkValidCallId(callId);
-        mHandler.obtainMessage(MSG_ANSWER_CALL, callId).sendToTarget();
+        SomeArgs args = SomeArgs.obtain();
+        args.arg1 = callId;
+        args.arg2 = videoState;
+        mHandler.obtainMessage(MSG_ANSWER_CALL, args).sendToTarget();
     }
 
     @Override