Treat regular and always-on hotwording settings as mutually exclusive.

chrome/browser/resources/hotword/state_manager.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('hotword', function() {
   'use strict';
 
   /**
    * Trivial container class for session information.
    * @param {!hotword.constants.SessionSource} source Source of the hotword
@@ skipping 122 matching lines @@
   StateManager.prototype = {
     /**
      * Request status details update. Intended to be called from the
      * hotwordPrivate.onEnabledChanged() event.
      */
     updateStatus: function() {
       chrome.hotwordPrivate.getStatus(this.handleStatus_.bind(this));
     },
 
     /**
-     * @return {boolean} True if hotwording is enabled.
+     * @return {boolean} True if google.com/NTP/launcher hotwording is enabled.
      */
-    isEnabled: function() {
-      assert(this.hotwordStatus_, 'No hotwording status (isEnabled)');
-      return this.hotwordStatus_.enabled;
+    isSometimesOnEnabled: function() {
+      assert(this.hotwordStatus_,
+             'No hotwording status (isSometimesOnEnabled)');
+      // Although the two settings are supposed to be mutually exclusive, it's
+      // possible for both to be set. In that case, always-on takes precedence.
+      return this.hotwordStatus_.enabled &&
+          !this.hotwordStatus_.alwaysOnEnabled;
     },
 
     /**
      * @return {boolean} True if always-on hotwording is enabled.
      */
     isAlwaysOnEnabled: function() {
       assert(this.hotwordStatus_, 'No hotword status (isAlwaysOnEnabled)');
-      return this.hotwordStatus_.enabled &&
-          this.hotwordStatus_.alwaysOnEnabled;
+      return this.hotwordStatus_.alwaysOnEnabled;
     },
 
     /**
      * Callback for hotwordPrivate.getStatus() function.
      * @param {chrome.hotwordPrivate.StatusDetails} status Current hotword
      *     status.
      * @private
      */
     handleStatus_: function(status) {
       hotword.debug('New hotword status', status);
       this.hotwordStatus_ = status;
       this.updateStateFromStatus_();
 
       this.onStatusChanged.dispatch();
     },
 
     /**
      * Updates state based on the current status.
      * @private
      */
     updateStateFromStatus_: function() {
       if (!this.hotwordStatus_)
         return;
 
-      if (this.hotwordStatus_.enabled) {
+      if (this.hotwordStatus_.enabled || this.hotwordStatus_.alwaysOnEnabled) {
         // Start the detector if there's a session, and shut it down if there
         // isn't.
         // NOTE(amistry): With always-on, we want a different behaviour with
         // sessions since the detector should always be running. The exception
         // being when the user triggers by saying 'Ok Google'. In that case, the
         // detector stops, so starting/stopping the launcher session should
         // restart the detector.
         if (this.sessions_.length)
           this.startDetector_();
         else
@@ skipping 193 matching lines @@
       hotword.debug('Stopping session for source: ' + source);
       this.removeSession_(source);
       this.updateStateFromStatus_();
     }
   };
 
   return {
     StateManager: StateManager
   };
 });