commit 4134e3c019104cd0a2ae9c6cf01552c6c47ebb7a
author Linux Build Service Account <lnxbuild@localhost> Wed Mar 18 10:50:59 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Mar 18 10:50:59 2015 -0700
tree 8d0a749740a43fc1c3107ed31ddda85bf74f177c
parent d9c84e82d56771e3109d8e33405765a21a0af530
parent 994531d05865327a216dbc45cc4782b9fd1e3d0d

Merge "In DSDA allow upto 4 calls" into LA.BF.1.1.1

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

diff --git a/src/com/android/server/telecom/CallReceiver.java b/src/com/android/server/telecom/CallReceiver.java
index 8e9a688..7ce80fb 100755
--- a/src/com/android/server/telecom/CallReceiver.java
+++ b/src/com/android/server/telecom/CallReceiver.java
@@ -90,7 +90,7 @@
                     isSkipSchemaParsing);
         }
         if (clientExtras == null) {
-            clientExtras = Bundle.EMPTY;
+            clientExtras = new Bundle();
         }
 
         final boolean isDefaultDialer = intent.getBooleanExtra(KEY_IS_DEFAULT_DIALER, false);
@@ -133,7 +133,7 @@
             clientExtras = intent.getBundleExtra(TelecomManager.EXTRA_INCOMING_CALL_EXTRAS);
         }
         if (clientExtras == null) {
-            clientExtras = Bundle.EMPTY;
+            clientExtras = new Bundle();
         }
 
         Log.d(TAG, "Processing incoming call from connection service [%s]",

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

diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index ddf4bb8..74af36e 100755
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -627,7 +627,7 @@
         int callCapabilities = 0;
         for (int i = 0; i < CONNECTION_TO_CALL_CAPABILITY.length; i += 2) {
             if ((CONNECTION_TO_CALL_CAPABILITY[i] & connectionCapabilities) != 0) {
-                callCapabilities &= CONNECTION_TO_CALL_CAPABILITY[i + 1];
+                callCapabilities |= CONNECTION_TO_CALL_CAPABILITY[i + 1];
             }
         }
         return callCapabilities;