Fix the corner case for new audio device is not selected as active if it is plugged in for the firs…

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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 997 matching lines @@
   bool found_active_device = false;
   bool last_active_device_activate_by_user = false;
   for (AudioDeviceMap::const_iterator it = audio_devices_.begin();
        it != audio_devices_.end(); ++it) {
     AudioDevice device = it->second;
     if (device.is_input != is_input || !device.is_for_simple_usage())
       continue;
 
     bool active = false;
     bool activate_by_user = false;
+    // If the device entry is not found in prefs, it is likley a new audio
+    // device plugged in after the cros is powered down. We should ignore the
+    // previously saved active device, and select the active device by priority.
+    // crbug.com/622045.
     if (!audio_pref_handler_->GetDeviceActive(device, &active,
-                                              &activate_by_user) ||
-        !active) {
+                                              &activate_by_user)) {
+      return false;
+    }
+
+    if (!active)
       continue;
-    }
 
     if (!found_active_device) {
       found_active_device = true;
       *active_device = device;
       last_active_device_activate_by_user = activate_by_user;
       continue;
     }
 
     // Choose the best one among multiple active devices from prefs.
     if (activate_by_user) {
@@ skipping 326 matching lines @@
                      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