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

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

Change-Id: I7db6bf5e4f450a8cdb5e0f4a4f1593b966a71fc0
This commit is contained in:
Nate Myren
2021-07-16 16:51:45 +00:00
committed by Automerger Merge Worker

View File

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