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

Commit 15dc41fa 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... 

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

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



Change-Id: I53128b4079d75b1faa15a961e6b1dc4b70f8cc7e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bc95dbd9 863abc6c

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

+22 −23
Original line number Diff line number Diff line
@@ -313,9 +313,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)) {