commit 78031a083408f1f81c091b8603ad9ec36ebd8054
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 21 03:21:46 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 21 03:21:47 2016 +0000
tree 33e9ff7d17a459865de2d48da37adacaf6305ede
parent 479872dff7e00ccfe57f7f153b223243ba4b7df1
parent 3aa3b99c5463aa6b46fc645c764ceef376c57fb3

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

src/com/android/server/telecom/BluetoothPhoneServiceImpl.java

diff --git a/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java b/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
index a69e659..f29a5e3 100644
--- a/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
+++ b/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
@@ -30,6 +30,7 @@
 import android.os.RemoteException;
 import android.telecom.Connection;
 import android.telecom.PhoneAccount;
+import android.telecom.VideoProfile;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
@@ -98,7 +99,7 @@
                     Log.i(TAG, "BT - answering call");
                     Call call = mCallsManager.getRingingCall();
                     if (call != null) {
-                        mCallsManager.answerCall(call, call.getVideoState());
+                        mCallsManager.answerCall(call, VideoProfile.STATE_AUDIO_ONLY);
                         return true;
                     }
                     return false;
@@ -499,7 +500,7 @@
             if (activeCall != null) {
                 mCallsManager.disconnectCall(activeCall);
                 if (ringingCall != null) {
-                    mCallsManager.answerCall(ringingCall, ringingCall.getVideoState());
+                    mCallsManager.answerCall(ringingCall, VideoProfile.STATE_AUDIO_ONLY);
                 } else if (heldCall != null) {
                     mCallsManager.unholdCall(heldCall);
                 }
@@ -512,7 +513,7 @@
                 updateHeadsetWithCallState(true /* force */);
                 return true;
             } else if (ringingCall != null) {
-                mCallsManager.answerCall(ringingCall, ringingCall.getVideoState());
+                mCallsManager.answerCall(ringingCall, VideoProfile.STATE_AUDIO_ONLY);
                 return true;
             } else if (heldCall != null) {
                 // CallsManager will hold any active calls when unhold() is called on a