Fix the UI issue for showing output muted in ash tray after the device wakes up with hdmi output re…

chromeos/audio/cras_audio_handler.cc

 // Copyright (c) 2013 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.
 
 #include "chromeos/audio/cras_audio_handler.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/bind.h"
@@ skipping 51 matching lines @@
 void CrasAudioHandler::AudioObserver::OnOutputNodeVolumeChanged(
     uint64_t /* node_id */,
     int /* volume */) {
 }
 
 void CrasAudioHandler::AudioObserver::OnInputNodeGainChanged(
     uint64_t /* node_id */,
     int /* gain */) {
 }
 
-void CrasAudioHandler::AudioObserver::OnOutputMuteChanged(bool /* mute_on */) {
-}
+void CrasAudioHandler::AudioObserver::OnOutputMuteChanged(
+    bool /* mute_on */,
+    bool /* system_adjust */) {}
 
 void CrasAudioHandler::AudioObserver::OnInputMuteChanged(bool /* mute_on */) {
 }
 
 void CrasAudioHandler::AudioObserver::OnAudioNodesChanged() {
 }
 
 void CrasAudioHandler::AudioObserver::OnActiveOutputNodeChanged() {
 }
 
@@ skipping 280 matching lines @@
   for (AudioDeviceMap::const_iterator it = audio_devices_.begin();
        it != audio_devices_.end();
        it++) {
     const AudioDevice& device = it->second;
     if (!device.is_input && device.active) {
       audio_pref_handler_->SetMuteValue(device, output_mute_on_);
     }
   }
 
   FOR_EACH_OBSERVER(AudioObserver, observers_,
-                    OnOutputMuteChanged(output_mute_on_));
+                    OnOutputMuteChanged(output_mute_on_, false));

[stevenjb, 2015/07/28 21:36:52]

false /* system_adjust */

[jennyz, 2015/07/28 22:40:44]

Done.

 }
 
 void CrasAudioHandler::AdjustOutputVolumeToAudibleLevel() {
   if (output_volume_ <= kMuteThresholdPercent) {
     // Avoid the situation when sound has been unmuted, but the volume
     // is set to a very low value, so user still can't hear any sound.
     SetOutputVolumePercent(kDefaultUnmuteVolumePercent);
   }
 }
 
@@ skipping 622 matching lines @@
     if (notify)
       NotifyActiveNodeChanged(false);
   }
 }
 
 void CrasAudioHandler::UpdateAudioAfterHDMIRediscoverGracePeriod() {
   VLOG(1) << "HDMI output re-discover grace period ends.";
   hdmi_rediscovering_ = false;
   if (!IsOutputMutedForDevice(active_output_node_id_)) {
     // Unmute the audio output after the HDMI transition period.
-    VLOG(1) << "Unmute output after HDMI rediscovring grace period.";
+    VLOG(1) << "Unmute output after HDMI rediscovering grace period.";
     SetOutputMuteInternal(false);
+
+    // Notify UI about the mute state change.
+    FOR_EACH_OBSERVER(
+        AudioObserver, observers_,
+        OnOutputMuteChanged(output_mute_on_, true)); /* system adjustment */

[stevenjb, 2015/07/28 21:36:52]

nit: 'true /* system_adjust */' (or put true on a separate line, but I don't
think clang format would be happy).

[jennyz, 2015/07/28 22:40:44]

Done.

   }
 }
 
 bool CrasAudioHandler::IsHDMIPrimaryOutputDevice() const {
   const AudioDevice* device = GetDeviceFromId(active_output_node_id_);
   return (device && device->type == chromeos::AUDIO_TYPE_HDMI);
 }
 
 void CrasAudioHandler::StartHDMIRediscoverGracePeriod() {
   VLOG(1) << "Start HDMI rediscovering grace period.";
   hdmi_rediscovering_ = true;
   hdmi_rediscover_timer_.Stop();
   hdmi_rediscover_timer_.Start(
       FROM_HERE, base::TimeDelta::FromMilliseconds(
                      hdmi_rediscover_grace_period_duration_in_ms_),
       this, &CrasAudioHandler::UpdateAudioAfterHDMIRediscoverGracePeriod);
 }
 
 void CrasAudioHandler::SetHDMIRediscoverGracePeriodForTesting(
     int duration_in_ms) {
   hdmi_rediscover_grace_period_duration_in_ms_ = duration_in_ms;
 }
 
 }  // namespace chromeos