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

Merge "Cancel RecognitionService if permission check fails" into sc-dev

Browse Source
This commit is contained in:
Nate Myren
2021-07-02 16:06:15 +00:00
committed by Android (Google) Code Review
parent ece342ba8c 6978614aeb
commit bae80e0db8
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,9 +120,15 @@ public abstract class RecognitionService extends Service {
} }
mCurrentCallback = new Callback(listener, attributionSource); mCurrentCallback = new Callback(listener, attributionSource);
RecognitionService.this.onStartListening(intent, mCurrentCallback); boolean preflightPermissionCheckPassed =
if (!checkPermissionAndStartDataDelivery()) { checkPermissionForPreflight();
if (preflightPermissionCheckPassed) {
RecognitionService.this.onStartListening(intent, mCurrentCallback);
}
if (!preflightPermissionCheckPassed || !checkPermissionAndStartDataDelivery()) {
listener.onError(SpeechRecognizer.ERROR_INSUFFICIENT_PERMISSIONS); listener.onError(SpeechRecognizer.ERROR_INSUFFICIENT_PERMISSIONS);
RecognitionService.this.onCancel(mCurrentCallback);
dispatchClearCallback();
Log.i(TAG, "caller doesn't have permission:" Log.i(TAG, "caller doesn't have permission:"
+ Manifest.permission.RECORD_AUDIO); + Manifest.permission.RECORD_AUDIO);
} }
@@ -460,6 +466,12 @@ public abstract class RecognitionService extends Service {
return mStartedDataDelivery; return mStartedDataDelivery;
} }
private boolean checkPermissionForPreflight() {
return PermissionChecker.checkPermissionForPreflight(RecognitionService.this,
Manifest.permission.RECORD_AUDIO, mCurrentCallback.getAttributionContextForCaller()
.getAttributionSource()) == PermissionChecker.PERMISSION_GRANTED;
}
void finishDataDelivery() { void finishDataDelivery() {
if (mStartedDataDelivery) { if (mStartedDataDelivery) {
mStartedDataDelivery = false; mStartedDataDelivery = false;