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

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

Merge "Cancel RecognitionService if permission check fails" into sc-dev am:... 

Merge "Cancel RecognitionService if permission check fails" into sc-dev am: bae80e0d am: d5296edb

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

Change-Id: I8c81830b2adf2c023324f5167a9f99aa7d70164d
parents 18d0e8d0 d5296edb

core/java/android/speech/RecognitionService.java

+14 −2
Original line number Diff line number Diff line
@@ -120,9 +120,15 @@ public abstract class RecognitionService extends Service { 
                }

                mCurrentCallback = new Callback(listener, attributionSource);



                boolean preflightPermissionCheckPassed =

                        checkPermissionForPreflight();

                if (preflightPermissionCheckPassed) {

                    RecognitionService.this.onStartListening(intent, mCurrentCallback);

                if (!checkPermissionAndStartDataDelivery()) {

                }

                if (!preflightPermissionCheckPassed || !checkPermissionAndStartDataDelivery()) {

                    listener.onError(SpeechRecognizer.ERROR_INSUFFICIENT_PERMISSIONS);

                    RecognitionService.this.onCancel(mCurrentCallback);

                    dispatchClearCallback();

                    Log.i(TAG, "caller doesn't have permission:"

                            + Manifest.permission.RECORD_AUDIO);

                }
@@ -460,6 +466,12 @@ public abstract class RecognitionService extends Service { 
        return mStartedDataDelivery;

    }



    private boolean checkPermissionForPreflight() {

        return PermissionChecker.checkPermissionForPreflight(RecognitionService.this,

                Manifest.permission.RECORD_AUDIO, mCurrentCallback.getAttributionContextForCaller()

                        .getAttributionSource()) == PermissionChecker.PERMISSION_GRANTED;

    }



    void finishDataDelivery() {

        if (mStartedDataDelivery) {

            mStartedDataDelivery = false;