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

Commit 1c47867d authored by Aleksandar Kiridžić's avatar Aleksandar Kiridžić Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ib7b75f9203d25c415caa5f65813ef7491315d575
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 330a3723 671d962a

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;

        }

        }