commit 2b4d5f1673f8fa6923d9d9e4a7b37d6801339f89
author Daniel Sandler <dsandler@android.com> Fri Sep 15 17:19:00 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 15 17:19:00 2023 +0000
tree b7002b82c78a7b0f48fa758f79b438781b9a348a
parent f9453c6980ce20ee6366649e5cbbac116402f2da
parent 987b2e7d35bda4a3b6966ec7c336088f0b29f309

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

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

Change-Id: I24342b509ef65c945cb44eba95dc688f6141a4f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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