Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69ea5c80 authored by Christian Frank's avatar Christian Frank
Browse files

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

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
parent c5532b03

services/musicrecognition/java/com/android/server/musicrecognition/MusicRecognitionManagerPerUserService.java

+18 −2
Original line number Diff line number Diff line
@@ -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)) {