From fd6e4820c6ee91c9c232a7598c1e45c002b868e7 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Fri, 17 Jul 2009 12:27:43 -0700 Subject: [PATCH] Fix issue 1985479 lots of backup NPEs. Check that stream type is not STREAM_BLUETOOTH_SCO before writting to settings. --- media/java/android/media/AudioService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index ee41021d0a051..58c04f3a1f74c 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -1327,10 +1327,12 @@ public class AudioService extends IAudioService.Stub { } private void persistVolume(VolumeStreamState streamState) { - System.putInt(mContentResolver, streamState.mVolumeIndexSettingName, - streamState.mIndex); - System.putInt(mContentResolver, streamState.mLastAudibleVolumeIndexSettingName, - streamState.mLastAudibleIndex); + if (streamState.mStreamType != AudioManager.STREAM_BLUETOOTH_SCO) { + System.putInt(mContentResolver, streamState.mVolumeIndexSettingName, + streamState.mIndex); + System.putInt(mContentResolver, streamState.mLastAudibleVolumeIndexSettingName, + streamState.mLastAudibleIndex); + } } private void persistRingerMode() {