commit 3aa862e2331a9733d5cbca24354e42463b3f63d8
author Santos Cordon <santoscordon@google.com> Sat Jul 19 00:23:17 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 18 18:24:25 2014 +0000
tree 10b51ebdfc5eebc52c081b30dccad1dc38a570f3
parent e9a0aac4589d0875bd40040038c7c93b61798ec4
parent 29b4ce42956dd712dbcc7a75ac90d80e8e333b2a

Merge "Fixing ADD_CALL (3/3)" into lmp-dev

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 3bf51d5..4168366 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -479,7 +479,7 @@
      * @return The capabilities with video capabilities applied.
      */
     private int applyVideoCapabilities(int capabilities) {
-        int currentCapabilities = getCallCapabilities();
+        int currentCapabilities = capabilities;
         if (mRemoteVideoCapable) {
             currentCapabilities |= CallCapabilities.SUPPORTS_VT_REMOTE;
         } else {

src/com/android/services/telephony/TelephonyConnectionService.java

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 04b016b..bf2e3a0 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -177,12 +177,17 @@
                 request.getExtras(),
                 request.getVideoState());
 
+        TelephonyConnection connection = null;
         if (phone.getPhoneType() == TelephonyManager.PHONE_TYPE_GSM) {
-            response.onSuccess(telephonyRequest, new GsmConnection(originalConnection));
+            connection = new GsmConnection(originalConnection);
         } else if (phone.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) {
-            response.onSuccess(telephonyRequest, new CdmaConnection(originalConnection));
-        } else {
+            connection = new CdmaConnection(originalConnection);
+        }
+
+        if (connection == null) {
             response.onCancel(request);
+        } else {
+            response.onSuccess(telephonyRequest, connection);
         }
     }