With always-on enabled, always shut down the hotword detector after a trigger.

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 198 matching lines @@
       // 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_.alwaysOnEnabled;
+      return this.hotwordStatus_.alwaysOnEnabled &&
+          !this.hotwordStatus_.trainingEnabled;
     },
 
     /**
      * @return {boolean} True if training is enabled.
      */
     isTrainingEnabled: function() {
       assert(this.hotwordStatus_, 'No hotword status (isTrainingEnabled)');
       return this.hotwordStatus_.trainingEnabled;
     },
 
@@ skipping 248 matching lines @@
       // order to restart the detector.
       if (this.sessions_.length) {
         var session = this.sessions_.pop();
         session.triggerCb_(event.log);
 
         hotword.metrics.recordEnum(
             hotword.constants.UmaMetrics.TRIGGER_SOURCE,
             UmaTriggerSources_[session.source_],
             hotword.constants.UmaTriggerSource.MAX);
       }
+
+      // If we're in always-on mode, shut down the hotword detector. The hotword
+      // stream requires that we close and re-open it after a trigger, and the
+      // only way to accomplish this is to shut everything down.
+      if (this.isAlwaysOnEnabled())
+        this.shutdownDetector_();
     },
 
     /**
      * Handle speaker model saved.
      * @private
      */
     onSpeakerModelSaved_: function() {
       hotword.debug('Speaker model saved!');
 
       if (this.sessions_.length) {
@@ skipping 75 matching lines @@
 
       if (oldLocked != this.isLocked_)
         this.updateStateFromStatus_();
     }
   };
 
   return {
     StateManager: StateManager
   };
 });