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

Commit 9b3155e2 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Start to count the init time from calling updateState function"... 

Merge "Merge "Start to count the init time from calling updateState function" into tm-dev am: 9f4fb486 am: a7b46544" into tm-d1-dev-plus-aosp
parents daa4b83c 9257592e

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