diff options
| author | Mike Lockwood <lockwood@google.com> | 2015-01-29 10:39:48 -0800 |
|---|---|---|
| committer | Mike Lockwood <lockwood@google.com> | 2015-01-29 10:41:26 -0800 |
| commit | 9c2d34c764f14ed7a5076bd38417afde0b246bd6 (patch) | |
| tree | 79de6256ab56e94275a19c866e5cd3973eddeda5 /services/usb/java/com/android/server | |
| parent | 6c67474dd4f6eb0894121dac67e797073a02980a (diff) | |
| download | frameworks_base-9c2d34c764f14ed7a5076bd38417afde0b246bd6.zip frameworks_base-9c2d34c764f14ed7a5076bd38417afde0b246bd6.tar.gz frameworks_base-9c2d34c764f14ed7a5076bd38417afde0b246bd6.tar.bz2 | |
UsbAlsaManager: Don't reselect current USB audio device on all USB disconnects
Change-Id: I4d3a0d803a6d1eb02ff48a7e8587a1ff6c66a500
Diffstat (limited to 'services/usb/java/com/android/server')
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbAlsaManager.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbAlsaManager.java b/services/usb/java/com/android/server/usb/UsbAlsaManager.java index 01a044e..7f0ab6b 100644 --- a/services/usb/java/com/android/server/usb/UsbAlsaManager.java +++ b/services/usb/java/com/android/server/usb/UsbAlsaManager.java @@ -410,17 +410,16 @@ public final class UsbAlsaManager { if (audioDevice != null) { if (audioDevice.mHasPlayback || audioDevice.mHasPlayback) { notifyDeviceState(audioDevice, false); + mSelectedAudioDevice = null; + + // if there any external devices left, select one of them + selectDefaultDevice(); } } UsbMidiDevice usbMidiDevice = mMidiDevices.remove(usbDevice); if (usbMidiDevice != null) { IoUtils.closeQuietly(usbMidiDevice); } - - mSelectedAudioDevice = null; - - // if there any external devices left, select one of them - selectDefaultDevice(); } /* package */ void setAccessoryAudioState(boolean enabled, int card, int device) { |