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

Merge "speech: Fix RemoteSpeechReco race condition" into sc-dev am: ede93e7710 am: f73725e348

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

Change-Id: Id5c81e8b6ac3195d2364a837715e6fadf885df81
This commit is contained in:
TreeHugger Robot
2021-07-13 17:40:25 +00:00
committed by Automerger Merge Worker
parent 650e7a131a f73725e348
commit bd16d09592
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/speech/RemoteSpeechRecognitionService.java
View File

@@ -125,10 +125,12 @@ final class RemoteSpeechRecognitionService extends ServiceConnector.Impl<IRecogn
} }
}); });
// Eager local evaluation to avoid reading a different or null value at closure-run-time
final DelegatingListener listenerToStart = this.mDelegatingListener;
run(service -> run(service ->
service.startListening( service.startListening(
recognizerIntent, recognizerIntent,
mDelegatingListener, listenerToStart,
attributionSource)); attributionSource));
} }
} }
@@ -162,7 +164,9 @@ final class RemoteSpeechRecognitionService extends ServiceConnector.Impl<IRecogn
} }
mRecordingInProgress = false; mRecordingInProgress = false;
run(service -> service.stopListening(mDelegatingListener)); // Eager local evaluation to avoid reading a different or null value at closure-run-time
final DelegatingListener listenerToStop = this.mDelegatingListener;
run(service -> service.stopListening(listenerToStop));
} }
} }