From 5ed14bcdb64c11d611666d963faaadb0184480b9 Mon Sep 17 00:00:00 2001
From: Ben Tian <btian@mozilla.com>
Date: Wed, 18 Jun 2014 11:08:55 +0800
Subject: [PATCH] Bug 1026475 - Device switch from Handset/Headset to BTSCO
 fails during call, r=etienne, a=1.4+

---
 apps/communications/dialer/js/call_screen.js               | 2 +-
 apps/communications/dialer/js/calls_handler.js             | 3 +--
 apps/communications/dialer/test/unit/calls_handler_test.js | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/communications/dialer/js/call_screen.js b/apps/communications/dialer/js/call_screen.js
index cefe8ded918f..08d415e30ca7 100644
--- a/apps/communications/dialer/js/call_screen.js
+++ b/apps/communications/dialer/js/call_screen.js
@@ -120,7 +120,7 @@ var CallScreen = {
                                     this.hideGroupDetails.bind(this));
 
     this.switchToDeviceButton.addEventListener('click',
-                                    this.switchToDefaultOut.bind(this));
+                                    this.switchToDefaultOut.bind(this, false));
     this.switchToReceiverButton.addEventListener('click',
                                     this.switchToReceiver.bind(this));
     this.switchToSpeakerButton.addEventListener('click',
diff --git a/apps/communications/dialer/js/calls_handler.js b/apps/communications/dialer/js/calls_handler.js
index 6cd208d9b2aa..e91f487f2a7b 100644
--- a/apps/communications/dialer/js/calls_handler.js
+++ b/apps/communications/dialer/js/calls_handler.js
@@ -54,8 +54,7 @@ var CallsHandler = (function callsHandler() {
     if (acm) {
       acm.addEventListener('headphoneschange', function onheadphoneschange() {
         if (acm.headphones) {
-          // Do not connect bluetooth SCO if headphone is plugged in
-          CallScreen.switchToDefaultOut(true /* do not connect */);
+          CallScreen.switchToDefaultOut();
         }
       });
     }
diff --git a/apps/communications/dialer/test/unit/calls_handler_test.js b/apps/communications/dialer/test/unit/calls_handler_test.js
index 228059a3096c..5e2dd52041fe 100644
--- a/apps/communications/dialer/test/unit/calls_handler_test.js
+++ b/apps/communications/dialer/test/unit/calls_handler_test.js
@@ -1373,7 +1373,7 @@ suite('calls handler', function() {
       test('should switch sound to default out', function() {
         var toDefaultSpy = this.sinon.spy(MockCallScreen, 'switchToDefaultOut');
         headphonesChange.yield();
-        assert.isTrue(toDefaultSpy.calledOnce);
+        assert.isTrue(toDefaultSpy.calledWithExactly());
       });
     });