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

Commit 671d962a authored by Aleksandar Kiridžić's avatar Aleksandar Kiridžić Committed by Android (Google) Code Review
Browse files

Merge "speech: Null-check service connection before usage" into udc-dev

parents b33ec254 dfac66be

core/java/android/speech/SpeechRecognizer.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -812,7 +812,7 @@ public class SpeechRecognizer { 
            Intent recognizerIntent,

            Intent recognizerIntent,

            Executor callbackExecutor,

            Executor callbackExecutor,

            RecognitionSupportCallback recognitionSupportCallback) {

            RecognitionSupportCallback recognitionSupportCallback) {

        if (!maybeInitializeManagerService()) {

        if (!maybeInitializeManagerService() || !checkOpenConnection()) {

            return;

            return;

        }

        }

        try {

        try {
@@ -831,7 +831,7 @@ public class SpeechRecognizer { 
            Intent recognizerIntent,

            Intent recognizerIntent,

            @Nullable Executor callbackExecutor,

            @Nullable Executor callbackExecutor,

            @Nullable ModelDownloadListener modelDownloadListener) {

            @Nullable ModelDownloadListener modelDownloadListener) {

        if (!maybeInitializeManagerService()) {

        if (!maybeInitializeManagerService() || !checkOpenConnection()) {

            return;

            return;

        }

        }