Merge "audio service fix dock after crash - DO NOT MERGE" into jb-mr1.1-dev

2012-11-08 12:49:49 -08:00
parent 75993947bb cd3231f501
commit 73176865a5
1 changed files with 7 additions and 0 deletions
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -3324,6 +3324,13 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
                                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;