summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Aleksandar Kiridzic <kiridza@google.com> 2023-05-18 16:44:24 +0100
committer Aleksandar Kiridzic <kiridza@google.com> 2023-05-23 12:48:17 +0100
commitdfac66be91554fc3b32cf72d1f6283b1432a8687 (patch)
tree37033414e44887b6116e9baa1e2b740a32ebe26d
parent862d7365c95311442f702749998763303d21d7ef (diff)
speech: Null-check service connection before usage
In SpeechRecognizer handleStartListening, handleStopMessage and handleCancelMessage, there is a null-check before calling the service’s methods. The same check is now added to handleCheckRecognitionSupport and handleTriggerModelDownload. Bug: 282013412 Test: atest CtsVoiceRecognitionTestCases Change-Id: I506282779e02747f8904cf9cbbdbc3ce135ee2b7
-rw-r--r--core/java/android/speech/SpeechRecognizer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/speech/SpeechRecognizer.java b/core/java/android/speech/SpeechRecognizer.java
index dacb25ca1628..bb5dd7f0cdfe 100644
--- a/core/java/android/speech/SpeechRecognizer.java
+++ b/core/java/android/speech/SpeechRecognizer.java
@@ -812,7 +812,7 @@ public class SpeechRecognizer {
Intent recognizerIntent,
Executor callbackExecutor,
RecognitionSupportCallback recognitionSupportCallback) {
- if (!maybeInitializeManagerService()) {
+ if (!maybeInitializeManagerService() || !checkOpenConnection()) {
return;
}
try {
@@ -831,7 +831,7 @@ public class SpeechRecognizer {
Intent recognizerIntent,
@Nullable Executor callbackExecutor,
@Nullable ModelDownloadListener modelDownloadListener) {
- if (!maybeInitializeManagerService()) {
+ if (!maybeInitializeManagerService() || !checkOpenConnection()) {
return;
}