Bug 1169861 - Ignore holdcamera when lockscreen is locked r=etienne_s

lissyx · Jun 10, 2015 · 3a2c1d7 · 3a2c1d7
1 parent d2f31eb
commit 3a2c1d7
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/apps/system/js/camera_trigger.js b/apps/system/js/camera_trigger.js
@@ -1,4 +1,4 @@
-/* globals BaseModule, MozActivity */
+/* globals BaseModule, MozActivity, Service */
 
 'use strict';
 
@@ -15,6 +15,12 @@
     TRACE: false,
 
     _handle_holdcamera: function(event) {
+      // Avoid triggering the Camera app multiple times if the lockscreen is
+      // locked
+      if (Service.query('locked')) {
+        return;
+      }
+
       this.debug('Received holdcamera');
       /* jshint unused:false */
       var activity = new MozActivity({

diff --git a/apps/system/test/marionette/homescreen_navigation_test.js b/apps/system/test/marionette/homescreen_navigation_test.js
@@ -15,7 +15,8 @@ marionette('Homescreen navigation >', function() {
       },
       settings: {
         'devtools.overlay': true,
-        'hud.reflows': true
+        'hud.reflows': true,
+        'notifications.resend': false
       }
     }
   });

diff --git a/apps/system/test/unit/camera_trigger_test.js b/apps/system/test/unit/camera_trigger_test.js
@@ -1,4 +1,4 @@
-/* global MocksHelper, BaseModule */
+/* global MocksHelper, BaseModule, Service */
 'use strict';
 
 require('/js/service.js');
@@ -36,9 +36,31 @@ suite('system/CameraTrigger', function() {
       activitySpy = this.sinon.spy(window, 'MozActivity');
     });
 
-    test('holdcamera triggers MozActivity', function() {
-      window.dispatchEvent(new CustomEvent('holdcamera', {}));
-      sinon.assert.calledWith(activitySpy, expectedActivity);
+    suite('LockScreen not locked', function() {
+      setup(function() {
+        this.sinon.stub(Service, 'query', function() {
+          return false;
+        });
+      });
+
+      test('holdcamera triggers MozActivity', function() {
+        window.dispatchEvent(new CustomEvent('holdcamera', {}));
+        sinon.assert.calledWith(activitySpy, expectedActivity);
+      });
     });
+
+    suite('LockScreen is locked', function() {
+      setup(function() {
+        this.sinon.stub(Service, 'query', function() {
+          return true;
+        });
+      });
+
+      test('holdcamera inhibited by lockscreen', function() {
+        window.dispatchEvent(new CustomEvent('holdcamera', {}));
+        sinon.assert.notCalled(activitySpy);
+      });
+    });
+
   });
 });