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

Commit 3413153f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Extend the timeout of update state" into tm-dev am: 6687030f am: e41d608c am: b82e422b 

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



Change-Id: I616347933d3b6dcd0f39b7e4816b2e77ddcd8385
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 08a68e06 b82e422b

core/java/android/service/voice/HotwordDetectionService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ public abstract class HotwordDetectionService extends Service { 
    private static final String TAG = "HotwordDetectionService";

    private static final String TAG = "HotwordDetectionService";

    private static final boolean DBG = false;

    private static final boolean DBG = false;





    private static final long UPDATE_TIMEOUT_MILLIS = 5000;

    private static final long UPDATE_TIMEOUT_MILLIS = 20000;





    /** @hide */

    /** @hide */

    public static final String KEY_INITIALIZATION_STATUS = "initialization_status";

    public static final String KEY_INITIALIZATION_STATUS = "initialization_status";

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -118,7 +118,7 @@ final class HotwordDetectionConnection { 
    private static final String KEY_RESTART_PERIOD_IN_SECONDS = "restart_period_in_seconds";

    private static final String KEY_RESTART_PERIOD_IN_SECONDS = "restart_period_in_seconds";

    // TODO: These constants need to be refined.

    // TODO: These constants need to be refined.

    private static final long VALIDATION_TIMEOUT_MILLIS = 4000;

    private static final long VALIDATION_TIMEOUT_MILLIS = 4000;

    private static final long MAX_UPDATE_TIMEOUT_MILLIS = 6000;

    private static final long MAX_UPDATE_TIMEOUT_MILLIS = 30000;

    private static final Duration MAX_UPDATE_TIMEOUT_DURATION =

    private static final Duration MAX_UPDATE_TIMEOUT_DURATION =

            Duration.ofMillis(MAX_UPDATE_TIMEOUT_MILLIS);

            Duration.ofMillis(MAX_UPDATE_TIMEOUT_MILLIS);

    private static final long RESET_DEBUG_HOTWORD_LOGGING_TIMEOUT_MILLIS = 60 * 60 * 1000; // 1 hour

    private static final long RESET_DEBUG_HOTWORD_LOGGING_TIMEOUT_MILLIS = 60 * 60 * 1000; // 1 hour