Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I7263ada9e311fef22810fe54a09e728bc3a6ade2
This commit is contained in:
Nate Myren
2021-07-16 16:51:11 +00:00
committed by Automerger Merge Worker
parent 43d5757809 0669fb0bfa
commit 0d196dc422
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/speech/SpeechRecognitionManagerServiceImpl.java
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);