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

Commit d7f17038 authored by lpeter's avatar lpeter
Browse files

Correct VALIDATION_TIMEOUT_MILLIS value to 3000 ms 

By trusted hotword design doc, the VALIDATION_TIMEOUT_MILLIS value
should be 3000 ms. We correct the VALIDATION_TIMEOUT_MILLIS.

Test: atest CtsVoiceInteractionTestCases
Bug: 193232191
Change-Id: I4e8f3fbaeb305373e4b964a45e5e26b3e3684bd5
parent 5568769a

services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java

+9 −2
Original line number Diff line number Diff line
@@ -129,7 +129,10 @@ final class HotwordDetectionConnection { 


    private static final String KEY_RESTART_PERIOD_IN_SECONDS = "restart_period_in_seconds";

    // TODO: These constants need to be refined.

    private static final long VALIDATION_TIMEOUT_MILLIS = 4000;

    // The validation timeout value is 3 seconds for onDetect of DSP trigger event.

    private static final long VALIDATION_TIMEOUT_MILLIS = 3000;

    // Write the onDetect timeout metric when it takes more time than MAX_VALIDATION_TIMEOUT_MILLIS.

    private static final long MAX_VALIDATION_TIMEOUT_MILLIS = 4000;

    private static final long MAX_UPDATE_TIMEOUT_MILLIS = 30000;

    private static final long EXTERNAL_HOTWORD_CLEANUP_MILLIS = 2000;

    private static final Duration MAX_UPDATE_TIMEOUT_DURATION =
@@ -659,6 +662,10 @@ final class HotwordDetectionConnection { 
        synchronized (mLock) {

            mValidatingDspTrigger = true;

            mRemoteHotwordDetectionService.run(service -> {

                // We use the VALIDATION_TIMEOUT_MILLIS to inform that the client needs to invoke

                // the callback before timeout value. In order to reduce the latency impact between

                // server side and client side, we need to use another timeout value

                // MAX_VALIDATION_TIMEOUT_MILLIS to monitor it.

                mCancellationKeyPhraseDetectionFuture = mScheduledExecutorService.schedule(

                        () -> {

                            // TODO: avoid allocate every time
@@ -673,7 +680,7 @@ final class HotwordDetectionConnection { 
                                Slog.w(TAG, "Failed to report onError status: ", e);

                            }

                        },

                        VALIDATION_TIMEOUT_MILLIS,

                        MAX_VALIDATION_TIMEOUT_MILLIS,

                        TimeUnit.MILLISECONDS);

                service.detectFromDspSource(

                        recognitionEvent,