commit 66fe882a6437de1010af0dc8cd7350f81f2e028a
author Santos Cordon <santoscordon@google.com> Fri Oct 10 16:10:58 2014 -0700
committer Santos Cordon <santoscordon@google.com> Fri Oct 10 16:16:45 2014 -0700
tree e6ebfdea22f21577bf14bfb97bed69c3c5f17185
parent 9e79dbe0d60087368f702b2dc98d36778c128032

Update foreground calls with child-parent call changes.

Bug: 17699262
Change-Id: I4de8bd876b142e2762a369a36ea2e7dcc7b84e65

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

diff --git a/src/com/android/server/telecom/BluetoothPhoneService.java b/src/com/android/server/telecom/BluetoothPhoneService.java
index 443e7c3..a2688a1 100644
--- a/src/com/android/server/telecom/BluetoothPhoneService.java
+++ b/src/com/android/server/telecom/BluetoothPhoneService.java
@@ -428,7 +428,8 @@
         Call ringingCall = callsManager.getRingingCall();
         Call heldCall = callsManager.getHeldCall();
 
-        Log.v(TAG, "Active: %s\nRinging: %s\nHeld: %s", activeCall, ringingCall, heldCall);
+        // TODO: Keeping as Log.i for now.  Move to Log.d after L release if BT proves stable.
+        Log.i(TAG, "Active: %s\nRinging: %s\nHeld: %s", activeCall, ringingCall, heldCall);
 
         if (chld == CHLD_TYPE_RELEASEHELD) {
             if (ringingCall != null) {
@@ -466,7 +467,7 @@
             }
         } else if (chld == CHLD_TYPE_ADDHELDTOCONF) {
             if (activeCall != null) {
-                if (activeCall != null && activeCall.can(PhoneCapabilities.MERGE_CONFERENCE)) {
+                if (activeCall.can(PhoneCapabilities.MERGE_CONFERENCE)) {
                     activeCall.mergeConference();
                     return true;
                 } else {