Merge change 7726 into donut

* 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

View File

@@ -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() {