Merge pull request #12740 from alivedise/bugzilla/915975/proximity-to…

…ggle Bug 915975 - Turn on screen whenever its turned off by proximity, r=timdream
mozilla-b2g · Oct 11, 2013 · 495912f · 495912f
2 parents 5d259f7 + 8522431
commit 495912f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/apps/system/js/screen_manager.js b/apps/system/js/screen_manager.js
@@ -205,10 +205,14 @@ var ScreenManager = {
         var telephony = window.navigator.mozTelephony;
         if (Bluetooth.isProfileConnected(Bluetooth.Profiles.SCO) ||
             telephony.speakerEnabled ||
-            StatusBar.headphonesActive)
+            StatusBar.headphonesActive) {
             // XXX: Remove this hack in Bug 868348
             // We shouldn't access headset status from statusbar.
+          if (this._screenOffBy == 'proximity') {
+            this.turnScreenOn();
+          }
           break;
+        }
 
         if (evt.near) {
           this.turnScreenOff(true, 'proximity');

diff --git a/apps/system/test/unit/screen_manager_test.js b/apps/system/test/unit/screen_manager_test.js
@@ -220,8 +220,9 @@ suite('system/ScreenManager', function() {
       test('if Bluetooth SCO connected', function() {
         stubBluetooth.Profiles = {};
         this.sinon.stub(stubBluetooth, 'isProfileConnected').returns(true);
+        ScreenManager._screenOffBy = 'proximity';
         ScreenManager.handleEvent({'type': 'userproximity'});
-        assert.isFalse(stubTurnOn.called);
+        assert.isTrue(stubTurnOn.called);
         assert.isFalse(stubTurnOff.called);
       });
 
@@ -243,6 +244,14 @@ suite('system/ScreenManager', function() {
         assert.isFalse(stubTurnOn.called);
         assert.isTrue(stubTurnOff.calledWith(true, 'proximity'));
       });
+
+      test('if earphone is connected', function() {
+        stubBluetooth.Profiles = {};
+        stubStatusBar.headponesActive = true;
+        ScreenManager._screenOffBy = 'proximity';
+        ScreenManager.handleEvent({'type': 'userproximity'});
+        assert.isTrue(stubTurnOn.called);
+      });
     });
 
     suite('Testing callschanged event', function() {