commit 987b2e7d35bda4a3b6966ec7c336088f0b29f309
author Daniel Sandler <dsandler@android.com> Fri Sep 15 16:46:37 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 15 16:46:37 2023 +0000
tree a3587834857178c2a473f1f171fcd52c5b8effcc
parent 00e4184b58ed0b4e3a212db0753dc6946da0a299
parent e5364f93d3208a66d599d7256d2e4cfaba989e0e

Merge "Fix NPE in TTS service if no engine string" into udc-dev

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

diff --git a/services/texttospeech/java/com/android/server/texttospeech/TextToSpeechManagerService.java b/services/texttospeech/java/com/android/server/texttospeech/TextToSpeechManagerService.java
index 9015563..2411498 100644
--- a/services/texttospeech/java/com/android/server/texttospeech/TextToSpeechManagerService.java
+++ b/services/texttospeech/java/com/android/server/texttospeech/TextToSpeechManagerService.java
@@ -63,6 +63,12 @@
         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) {