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

Commit 77bc47cc 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: Ief297e1281c7b8976639edab36e5e7c445d096f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ce5c3fe6 987b2e7d

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

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

        public void createSession(String engine,

                ITextToSpeechSessionCallback sessionCallback) {

                ITextToSpeechSessionCallback sessionCallback) {

            synchronized (mLock) {

            synchronized (mLock) {

                if (engine == null) {

                    runSessionCallbackMethod(

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

                    return;

                }



                TextToSpeechManagerPerUserService perUserService = getServiceForUserLocked(

                TextToSpeechManagerPerUserService perUserService = getServiceForUserLocked(

                        UserHandle.getCallingUserId());

                        UserHandle.getCallingUserId());

                if (perUserService != null) {

                if (perUserService != null) {