drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address corner case in which empty audio is requested and MusicRecognitionManagerService crashes.

Browse Source 
Behavior before this change would turn on mic indicator and then crash
(leaving the indicator on indefinitely).

Second use case: Allow clients of the API to invoke the service without
actually streaming audio. For context see:
https://b.corp.google.com/issues/184808866#comment11

BUG: 192938158
BUG: 184808866
Change-Id: I17d1b7e1a489262a034d333fc42fb1dcd45c48c1
This commit is contained in:
Christian Frank 2021-07-06 09:25:35 +02:00
parent c5532b030c
commit 69ea5c8016
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
services/musicrecognition/java/com/android/server/musicrecognition/MusicRecognitionManagerPerUserService.java
View File

@ -208,6 +208,24 @@ public final class MusicRecognitionManagerPerUserService extends
@NonNull RecognitionRequest recognitionRequest,
IMusicRecognitionManagerCallback clientCallback,
ParcelFileDescriptor audioSink) {
int maxAudioLengthSeconds = Math.min(recognitionRequest.getMaxAudioLengthSeconds(),
MAX_STREAMING_SECONDS);
if (maxAudioLengthSeconds <= 0) {
// TODO(b/192992319): A request to stream 0s of audio can be used to initialize the
// music recognition service implementation, hence not reporting an error here.
// The TODO for Android T is to move this functionality into an init() API call.
Slog.i(TAG, "No audio requested. Closing stream.");
try {
audioSink.close();
clientCallback.onAudioStreamClosed();
} catch (IOException e) {
Slog.e(TAG, "Problem closing stream.", e);
} catch (RemoteException ignored) {
// Ignored.
}
return;
}
try {
startRecordAudioOp(attributionTag);
} catch (SecurityException e) {
@ -224,8 +242,6 @@ public final class MusicRecognitionManagerPerUserService extends
return;
}
int maxAudioLengthSeconds = Math.min(recognitionRequest.getMaxAudioLengthSeconds(),
MAX_STREAMING_SECONDS);
AudioRecord audioRecord = createAudioRecord(recognitionRequest, maxAudioLengthSeconds);
try (OutputStream fos =
new ParcelFileDescriptor.AutoCloseOutputStream(audioSink)) {