Merge "Cancel RecognitionService if permission check fails" into sc-dev (bae80e0d) · Commits · e / os / android_frameworks_base

core/java/android/speech/RecognitionService.java

+14 −2

Original line number	Diff line number	Diff line
		@@ -120,9 +120,15 @@ public abstract class RecognitionService extends Service {
		}
		mCurrentCallback = new Callback(listener, attributionSource);

		boolean preflightPermissionCheckPassed =
		checkPermissionForPreflight();
		if (preflightPermissionCheckPassed) {
		RecognitionService.this.onStartListening(intent, mCurrentCallback);
		if (!checkPermissionAndStartDataDelivery()) {
		}
		if (!preflightPermissionCheckPassed \|\| !checkPermissionAndStartDataDelivery()) {
		listener.onError(SpeechRecognizer.ERROR_INSUFFICIENT_PERMISSIONS);
		RecognitionService.this.onCancel(mCurrentCallback);
		dispatchClearCallback();
		Log.i(TAG, "caller doesn't have permission:"
		+ Manifest.permission.RECORD_AUDIO);
		}
		@@ -460,6 +466,12 @@ public abstract class RecognitionService extends Service {
		return mStartedDataDelivery;
		}

		private boolean checkPermissionForPreflight() {
		return PermissionChecker.checkPermissionForPreflight(RecognitionService.this,
		Manifest.permission.RECORD_AUDIO, mCurrentCallback.getAttributionContextForCaller()
		.getAttributionSource()) == PermissionChecker.PERMISSION_GRANTED;
		}

		void finishDataDelivery() {
		if (mStartedDataDelivery) {
		mStartedDataDelivery = false;