1 files changed, 11 insertions, 7 deletions
diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
index d8bd6a576fad..b60f923d7bc7 100755
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -2217,19 +2217,23 @@ public abstract class ConnectionService extends Service {
 
     private void answerVideo(String callId, int videoState) {
         Log.i(this, "answerVideo %s", callId);
-        if (mConnectionById.containsKey(callId)) {
-            findConnectionForAction(callId, "answer").onAnswer(videoState);
-        } else {
-            findConferenceForAction(callId, "answer").onAnswer(videoState);
-        }
+        doAnswer(callId, videoState);
     }
 
     private void answer(String callId) {
         Log.i(this, "answer %s", callId);
+        doAnswer(callId, VideoProfile.STATE_AUDIO_ONLY);
+    }
+
+    /**
+     * Access is public because protected access is not allowed.
+     * @hide
+     */
+    public void doAnswer(String callId, int videoState) {
         if (mConnectionById.containsKey(callId)) {
-            findConnectionForAction(callId, "answer").onAnswer();
+            findConnectionForAction(callId, "answer").onAnswer(videoState);
         } else {
-            findConferenceForAction(callId, "answer").onAnswer();
+            findConferenceForAction(callId, "answer").onAnswer(videoState);
         }
     }