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

Commit 2b4d5f16 authored by Daniel Sandler's avatar Daniel Sandler Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in TTS service if no engine string" into udc-dev am: 987b2e7d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24758914



Change-Id: I24342b509ef65c945cb44eba95dc688f6141a4f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f9453c69 987b2e7d

services/texttospeech/java/com/android/server/texttospeech/TextToSpeechManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -63,6 +63,12 @@ public final class TextToSpeechManagerService extends 
        public void createSession(String engine,

                ITextToSpeechSessionCallback sessionCallback) {

            synchronized (mLock) {

                if (engine == null) {

                    runSessionCallbackMethod(

                            () -> sessionCallback.onError("Engine cannot be null"));

                    return;

                }



                TextToSpeechManagerPerUserService perUserService = getServiceForUserLocked(

                        UserHandle.getCallingUserId());

                if (perUserService != null) {