commit 8a8e2a4b9c7ed373e7cc94befd60de90de587e19
author Eric Laurent <elaurent@google.com> Thu Nov 08 15:45:23 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 08 15:45:23 2012 -0800
tree fba4b095f7d07606de789a29efca6a354a6ebef8
parent 122dbe96d89e8d5439cf41b92ac8b0ec435f331e
parent 98e5c81438f36d907215eeba338ee834c29791de

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

media/java/android/media/AudioService.java

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;