Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8b117e1 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by Android Git Automerger
Browse files

am a8d5644b: Merge change 7726 into donut 

Merge commit 'a8d5644b'

* commit 'a8d5644b':
  Fix issue 1985479	lots of backup NPEs.
parents def06bce a8d5644b

media/java/android/media/AudioService.java

+6 −4
Original line number Diff line number Diff line
@@ -1327,11 +1327,13 @@ public class AudioService extends IAudioService.Stub { 
        }



        private void persistVolume(VolumeStreamState streamState) {

            if (streamState.mStreamType != AudioManager.STREAM_BLUETOOTH_SCO) {

                System.putInt(mContentResolver, streamState.mVolumeIndexSettingName,

                        streamState.mIndex);

                System.putInt(mContentResolver, streamState.mLastAudibleVolumeIndexSettingName,

                        streamState.mLastAudibleIndex);

            }

        }



        private void persistRingerMode() {

            System.putInt(mContentResolver, System.MODE_RINGER, mRingerMode);