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

Commit 88696daa authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I16a4dafb0c2a3f6828102d51723f0f1d2f80e2d2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e356c40a a3f36b1e

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) {