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

Commit 7a68c409 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I70af440f09e8ddc05be12c3e9ad2803ef27e2f47
parents 318f61af ede93e77

services/core/java/com/android/server/speech/RemoteSpeechRecognitionService.java

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

                    service.startListening(

                            recognizerIntent,

                            mDelegatingListener,

                            listenerToStart,

                            attributionSource));

        }

    }
@@ -162,7 +164,9 @@ final class RemoteSpeechRecognitionService extends ServiceConnector.Impl<IRecogn 
            }

            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));

        }

    }