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

Commit c6137eec authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "AudioService: fix NPE in audio server error callback"

parents e6b62384 7e77c3db

services/core/java/com/android/server/audio/AudioService.java

+4 −2
Original line number Diff line number Diff line
@@ -415,8 +415,10 @@ public class AudioService extends IAudioService.Stub 
        public void onError(int error) {

            switch (error) {

                case AudioSystem.AUDIO_STATUS_SERVER_DIED:

                    // check for null in case error callback is called during instance creation

                    if (mRecordMonitor != null) {

                        mRecordMonitor.onAudioServerDied();



                    }

                    sendMsg(mAudioHandler, MSG_AUDIO_SERVER_DIED,

                            SENDMSG_NOOP, 0, 0, null, 0);

                    sendMsg(mAudioHandler, MSG_DISPATCH_AUDIO_SERVER_STATE,