diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-18 02:12:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-18 02:12:02 -0700 |
| commit | a8d5644b548263d68e2c9bfff58958b29c3525ff (patch) | |
| tree | d66639f4954c17d90c2bf035127252dec8aaf17f /media | |
| parent | 4b897aa99bf71f933f5b202c1531858382122d6f (diff) | |
| parent | fd6e4820c6ee91c9c232a7598c1e45c002b868e7 (diff) | |
| download | frameworks_base-a8d5644b548263d68e2c9bfff58958b29c3525ff.zip frameworks_base-a8d5644b548263d68e2c9bfff58958b29c3525ff.tar.gz frameworks_base-a8d5644b548263d68e2c9bfff58958b29c3525ff.tar.bz2 | |
Merge change 7726 into donut
* changes:
Fix issue 1985479 lots of backup NPEs.
Diffstat (limited to 'media')
| -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() { |