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

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

Merge "Correctly set trusted AttributionSource in RecognitionService" into... 

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

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

Change-Id: I84a0612ef7e3eee4301c95059077854e42116101
parents c577086e ecb07cdf

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

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

                            attributionSource.enforceCallingUid();

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

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

                                attributionSource = mMaster.getContext()

                                        .getSystemService(PermissionManager.class)

                                        .registerAttributionSource(attributionSource);

                            }

                            service.startListening(recognizerIntent, listener, attributionSource);