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

Commit 1f510560 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Start to count the init time from calling updateState function" into tm-dev am: 9f4fb486 

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



Change-Id: I71c303d802163c25bc4a9c060197723c175c1038
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 45cdc61c 9f4fb486

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

+22 −23
Original line number Diff line number Diff line
@@ -315,9 +315,8 @@ final class HotwordDetectionConnection { 
                // TODO: (b/181842909) Report an error to voice interactor

                Slog.w(TAG, "Failed to updateState for HotwordDetectionService", e);

            }

            return future;

        }).orTimeout(MAX_UPDATE_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)

                .whenComplete((res, err) -> {

            return future.orTimeout(MAX_UPDATE_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);

        }).whenComplete((res, err) -> {

            if (err instanceof TimeoutException) {

                Slog.w(TAG, "updateState timed out");

                if (mUpdateStateAfterStartFinished.getAndSet(true)) {