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

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

Merge "Correctly set trusted AttributionSource in RecognitionService" into sc-dev am: 0669fb0b 

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

Change-Id: I7db6bf5e4f450a8cdb5e0f4a4f1593b966a71fc0
parents 57e372bc 0669fb0b

services/core/java/com/android/server/speech/SpeechRecognitionManagerServiceImpl.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -141,7 +141,8 @@ final class SpeechRecognitionManagerServiceImpl extends 
                                        throws RemoteException {

                                        throws RemoteException {

                            attributionSource.enforceCallingUid();

                            attributionSource.enforceCallingUid();

                            if (!attributionSource.isTrusted(mMaster.getContext())) {

                            if (!attributionSource.isTrusted(mMaster.getContext())) {

                                mMaster.getContext().getSystemService(PermissionManager.class)

                                attributionSource = mMaster.getContext()

                                        .getSystemService(PermissionManager.class)

                                        .registerAttributionSource(attributionSource);

                                        .registerAttributionSource(attributionSource);

                            }

                            }

                            service.startListening(recognizerIntent, listener, attributionSource);

                            service.startListening(recognizerIntent, listener, attributionSource);