Merge "Correctly set trusted AttributionSource in RecognitionService" into sc-dev

This commit is contained in:
Nate Myren
2021-07-16 16:37:57 +00:00
committed by Android (Google) Code Review

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