Merge pull request #20723 from bentian/bug-1026475-14

Bug 1026475 - Device switch from Handset/Headset to BTSCO fails during call, r=etienne, a=1.4+
mozilla-b2g · Jun 19, 2014 · dff52e8 · dff52e8
2 parents 479db54 + 5ed14bc
commit dff52e8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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());
       });
     });