[automerger] IMS: Fix issue with answering call for some 3rd party apps am: 3d24e82f45

Change-Id: I69e7658cc70d6ccdc9aca92caa744c90ea6ba032

1 files changed, 11 insertions, 13 deletions

diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
index b60f923d7bc7..c0b540e024bb 100755
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -2215,25 +2215,23 @@ public abstract class ConnectionService extends Service {
         findConnectionForAction(callId, "abort").onAbort();
     }
 
-    private void answerVideo(String callId, int videoState) {
+    /** {@hide} */
+    protected void answerVideo(String callId, int videoState) {
         Log.i(this, "answerVideo %s", callId);
-        doAnswer(callId, videoState);
+        if (mConnectionById.containsKey(callId)) {
+            findConnectionForAction(callId, "answer").onAnswer(videoState);
+        } else {
+            findConferenceForAction(callId, "answer").onAnswer(videoState);
+        }
     }
 
-    private void answer(String callId) {
+    /** {@hide} */
+    protected 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(videoState);
+            findConnectionForAction(callId, "answer").onAnswer();
         } else {
-            findConferenceForAction(callId, "answer").onAnswer(videoState);
+            findConferenceForAction(callId, "answer").onAnswer();
         }
     }