diff options
| author | Eric Laurent <elaurent@google.com> | 2009-07-17 12:27:43 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2009-07-17 12:27:43 -0700 |
| commit | fd6e4820c6ee91c9c232a7598c1e45c002b868e7 (patch) | |
| tree | 85bfd4de2e924e3f1a2e94cb2f5e81598d9280f9 /media/java | |
| parent | 19e53f7ae506ccb294f46a36c70d7f3154b258ad (diff) | |
| download | frameworks_base-fd6e4820c6ee91c9c232a7598c1e45c002b868e7.zip frameworks_base-fd6e4820c6ee91c9c232a7598c1e45c002b868e7.tar.gz frameworks_base-fd6e4820c6ee91c9c232a7598c1e45c002b868e7.tar.bz2 | |
Fix issue 1985479 lots of backup NPEs.
Check that stream type is not STREAM_BLUETOOTH_SCO before writting to settings.
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/AudioService.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index ee41021..58c04f3 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() { |