Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 7726 into donut

Browse Source 
* changes:
  Fix issue 1985479	lots of backup NPEs.
This commit is contained in:
Android (Google) Code Review
2009-07-18 02:12:02 -07:00
parent 4b897aa99b fd6e4820c6
commit a8d5644b54
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/AudioService.java
View File

@@ -1327,11 +1327,13 @@ public class AudioService extends IAudioService.Stub {
} }
private void persistVolume(VolumeStreamState streamState) { private void persistVolume(VolumeStreamState streamState) {
if (streamState.mStreamType != AudioManager.STREAM_BLUETOOTH_SCO) {
System.putInt(mContentResolver, streamState.mVolumeIndexSettingName, System.putInt(mContentResolver, streamState.mVolumeIndexSettingName,
streamState.mIndex); streamState.mIndex);
System.putInt(mContentResolver, streamState.mLastAudibleVolumeIndexSettingName, System.putInt(mContentResolver, streamState.mLastAudibleVolumeIndexSettingName,
streamState.mLastAudibleIndex); streamState.mLastAudibleIndex);
} }
}
private void persistRingerMode() { private void persistRingerMode() {
System.putInt(mContentResolver, System.MODE_RINGER, mRingerMode); System.putInt(mContentResolver, System.MODE_RINGER, mRingerMode);