diff options
| author | Eric Laurent <elaurent@google.com> | 2012-11-02 16:48:26 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2012-11-08 09:05:22 -0800 |
| commit | cd3231f501b7ee038af5ab378ee5550090b7bc2e (patch) | |
| tree | a51c46724f22d516b5b2385e401f473270651a44 /media | |
| parent | 1f6cf5fade6021c1ce788541ec4a60ee36d20651 (diff) | |
| download | frameworks_base-cd3231f501b7ee038af5ab378ee5550090b7bc2e.zip frameworks_base-cd3231f501b7ee038af5ab378ee5550090b7bc2e.tar.gz frameworks_base-cd3231f501b7ee038af5ab378ee5550090b7bc2e.tar.bz2 | |
audio service fix dock after crash - DO NOT MERGE
merge from master:
"audio service: set dock use on mediaserver restart
Restore forced usage of dock audio for media according to
current setting when media server restarts."
Bug 7485250.
Change-Id: Ie67b80ede1ed92d223dd96de83c1beb985dfba06
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/AudioService.java | 7 |
1 files changed, 7 insertions, 0 deletions
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 @@ 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; |