commit b6c18699844c158cf2bf3b39f13bd7a7df5cd16a
author Tyler Gunn <tgunn@google.com> Sat Aug 30 06:26:17 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Aug 30 06:26:17 2014 +0000
tree 29053e8d522d4c4f7f744078ef24e3a566384418
parent c176aa626520d93287d6849542482775ff7b22d8
parent 041eff6b45ff885e77d2e1b8b9ca9099dd0885d2

Merge "Hiding videoState values in telecomm APIs. (2/3)" into lmp-dev

src/com/android/telecomm/ConnectionServiceWrapper.java

diff --git a/src/com/android/telecomm/ConnectionServiceWrapper.java b/src/com/android/telecomm/ConnectionServiceWrapper.java
index 5fcb9bd..33f472f 100644
--- a/src/com/android/telecomm/ConnectionServiceWrapper.java
+++ b/src/com/android/telecomm/ConnectionServiceWrapper.java
@@ -35,6 +35,7 @@
 import android.telecomm.PhoneAccount;
 import android.telecomm.PhoneAccountHandle;
 import android.telecomm.StatusHints;
+import android.telecomm.VideoProfile;
 import android.telephony.DisconnectCause;
 
 import com.android.internal.os.SomeArgs;
@@ -740,7 +741,11 @@
         if (callId != null && isServiceValid("answer")) {
             try {
                 logOutgoing("answer %s %d", callId, videoState);
-                mServiceInterface.answer(callId, videoState);
+                if (videoState == VideoProfile.VideoState.AUDIO_ONLY) {
+                    mServiceInterface.answer(callId);
+                } else {
+                    mServiceInterface.answerVideo(callId, videoState);
+                }
             } catch (RemoteException e) {
             }
         }