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

Merge "Only check downstream permissions in preflight in RecognitionService" into sc-dev am: 3a2373352f

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

Change-Id: Ice15cf120e64e15ac3f94834180947d18bc4ed68
This commit is contained in:
TreeHugger Robot
2021-07-15 18:00:22 +00:00
committed by Automerger Merge Worker
parent 7a58d28e3e 3a2373352f
commit 59927022e7
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/speech/RecognitionService.java
View File

@@ -115,18 +115,14 @@ public abstract class RecognitionService extends Service {
@NonNull AttributionSource attributionSource) { @NonNull AttributionSource attributionSource) {
try { try {
if (mCurrentCallback == null) { if (mCurrentCallback == null) {
Context attributionContext = createContext(new ContextParams.Builder()
.setNextAttributionSource(attributionSource)
.build());
boolean preflightPermissionCheckPassed = checkPermissionForPreflight( boolean preflightPermissionCheckPassed = checkPermissionForPreflight(
attributionContext.getAttributionSource()); attributionSource);
if (preflightPermissionCheckPassed) { if (preflightPermissionCheckPassed) {
if (DBG) { if (DBG) {
Log.d(TAG, "created new mCurrentCallback, listener = " Log.d(TAG, "created new mCurrentCallback, listener = "
+ listener.asBinder()); + listener.asBinder());
} }
mCurrentCallback = new Callback(listener, attributionSource, mCurrentCallback = new Callback(listener, attributionSource);
attributionContext);
RecognitionService.this.onStartListening(intent, mCurrentCallback); RecognitionService.this.onStartListening(intent, mCurrentCallback);
} }
@@ -293,15 +289,8 @@ public abstract class RecognitionService extends Service {
private Callback(IRecognitionListener listener, private Callback(IRecognitionListener listener,
@NonNull AttributionSource attributionSource) { @NonNull AttributionSource attributionSource) {
this(listener, attributionSource, null);
}
private Callback(IRecognitionListener listener,
@NonNull AttributionSource attributionSource,
@Nullable Context attributionContext) {
mListener = listener; mListener = listener;
mCallingAttributionSource = attributionSource; mCallingAttributionSource = attributionSource;
mAttributionContext = attributionContext;
} }
/** /**