Merge change 7726 into donut
* changes: Fix issue 1985479 lots of backup NPEs.
This commit is contained in:
@@ -1327,10 +1327,12 @@ public class AudioService extends IAudioService.Stub {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void persistVolume(VolumeStreamState streamState) {
|
private void persistVolume(VolumeStreamState streamState) {
|
||||||
System.putInt(mContentResolver, streamState.mVolumeIndexSettingName,
|
if (streamState.mStreamType != AudioManager.STREAM_BLUETOOTH_SCO) {
|
||||||
streamState.mIndex);
|
System.putInt(mContentResolver, streamState.mVolumeIndexSettingName,
|
||||||
System.putInt(mContentResolver, streamState.mLastAudibleVolumeIndexSettingName,
|
streamState.mIndex);
|
||||||
streamState.mLastAudibleIndex);
|
System.putInt(mContentResolver, streamState.mLastAudibleVolumeIndexSettingName,
|
||||||
|
streamState.mLastAudibleIndex);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void persistRingerMode() {
|
private void persistRingerMode() {
|
||||||
|
|||||||
Reference in New Issue
Block a user