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

Commit dfa7d1bc 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 am: 15dc41fa

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



Change-Id: I6c31415bd3c6e98e56399be9d24771f0751de5a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d0e9aff1 15dc41fa

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

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