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

Commit 04e4676b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Only check downstream permissions in preflight in RecognitionService"... 

Merge "Only check downstream permissions in preflight in RecognitionService" into sc-dev am: 3a237335 am: 740f2c21

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

Change-Id: Ia71add67a8f86d76a4a7848c014dd68da21807a7
parents 266ec5f4 740f2c21

core/java/android/speech/RecognitionService.java

+2 −13
Original line number Diff line number Diff line
@@ -115,18 +115,14 @@ public abstract class RecognitionService extends Service { 
            @NonNull AttributionSource attributionSource) {

        try {

            if (mCurrentCallback == null) {

                Context attributionContext = createContext(new ContextParams.Builder()

                        .setNextAttributionSource(attributionSource)

                        .build());

                boolean preflightPermissionCheckPassed = checkPermissionForPreflight(

                        attributionContext.getAttributionSource());

                        attributionSource);

                if (preflightPermissionCheckPassed) {

                    if (DBG) {

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

                                + listener.asBinder());

                    }

                    mCurrentCallback = new Callback(listener, attributionSource,

                            attributionContext);

                    mCurrentCallback = new Callback(listener, attributionSource);

                    RecognitionService.this.onStartListening(intent, mCurrentCallback);

                }
@@ -293,15 +289,8 @@ public abstract class RecognitionService extends Service { 


        private Callback(IRecognitionListener listener,

                @NonNull AttributionSource attributionSource) {

            this(listener, attributionSource, null);

        }



        private Callback(IRecognitionListener listener,

                @NonNull AttributionSource attributionSource,

                @Nullable Context attributionContext) {

            mListener = listener;

            mCallingAttributionSource = attributionSource;

            mAttributionContext = attributionContext;

        }



        /**