am 98e5c814: am 73176865: Merge "audio service fix dock after crash - DO NOT MERGE" into jb-mr1.1-dev
* commit '98e5c81438f36d907215eeba338ee834c29791de':
audio service fix dock after crash - DO NOT MERGE
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index 315196e..87ece50 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -3324,6 +3324,13 @@
mBluetoothA2dpEnabled ?
AudioSystem.FORCE_NONE : AudioSystem.FORCE_NO_BT_A2DP);
}
+
+ synchronized (mSettingsLock) {
+ AudioSystem.setForceUse(AudioSystem.FOR_DOCK,
+ mDockAudioMediaEnabled ?
+ AudioSystem.FORCE_ANALOG_DOCK : AudioSystem.FORCE_NONE);
+ }
+
// indicate the end of reconfiguration phase to audio HAL
AudioSystem.setParameters("restarting=false");
break;