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

Commit 7e77c3db authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

AudioService: fix NPE in audio server error callback 

In case the audio server error callback is called during the
construction of AudioService, the recording activity monitor may
not have been created yet and may be null.

Bug: 146816771
Test: check logs on boot according to bug
Change-Id: Ic8e8de998faa1fc485357f0eea25cdca9436a46c
parent 61c760e7

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,