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

Commit ecb07cdf 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: Ib7151af44f40ed9424b184bfb54697c5ea7818ff
parents 0088aed8 0669fb0b

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);