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

Commit ad966ee7 authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

Merge "Skip preflight RECORD_AUDIO in RecognitionService if FD provided" into... 

Merge "Skip preflight RECORD_AUDIO in RecognitionService if FD provided" into tm-dev am: 39e65acd am: b59c6753

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



Change-Id: I60b7133fd6d339ea462edf55bcbe4bf4bfddd9b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ca29e8a b59c6753

core/java/android/speech/RecognitionService.java

+3 −2
Original line number Diff line number Diff line
@@ -129,8 +129,9 @@ public abstract class RecognitionService extends Service { 
            @NonNull AttributionSource attributionSource) {

        try {

            if (mCurrentCallback == null) {

                boolean preflightPermissionCheckPassed = checkPermissionForPreflightNotHardDenied(

                        attributionSource);

                boolean preflightPermissionCheckPassed =

                        intent.hasExtra(RecognizerIntent.EXTRA_AUDIO_SOURCE)

                        || checkPermissionForPreflightNotHardDenied(attributionSource);

                if (preflightPermissionCheckPassed) {

                    if (DBG) {

                        Log.d(TAG, "created new mCurrentCallback, listener = "