Merge "Skip preflight RECORD_AUDIO in RecognitionService if FD provided" into tm-dev am: 39e65acd0a am: 9d4c1d0dab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18298904 Change-Id: I5b3b91e89dc065aee96d41707b54da471e28ec45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -129,8 +129,9 @@ public abstract class RecognitionService extends Service {
|
|||||||
@NonNull AttributionSource attributionSource) {
|
@NonNull AttributionSource attributionSource) {
|
||||||
try {
|
try {
|
||||||
if (mCurrentCallback == null) {
|
if (mCurrentCallback == null) {
|
||||||
boolean preflightPermissionCheckPassed = checkPermissionForPreflightNotHardDenied(
|
boolean preflightPermissionCheckPassed =
|
||||||
attributionSource);
|
intent.hasExtra(RecognizerIntent.EXTRA_AUDIO_SOURCE)
|
||||||
|
|| checkPermissionForPreflightNotHardDenied(attributionSource);
|
||||||
if (preflightPermissionCheckPassed) {
|
if (preflightPermissionCheckPassed) {
|
||||||
if (DBG) {
|
if (DBG) {
|
||||||
Log.d(TAG, "created new mCurrentCallback, listener = "
|
Log.d(TAG, "created new mCurrentCallback, listener = "
|
||||||
|
|||||||
Reference in New Issue
Block a user