Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-19 09:06:14 +00:00
committed by Android (Google) Code Review
parent a709ab9fb8 8de8268420
commit 9f4fb486d8
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java
View File

@@ -315,29 +315,28 @@ final class HotwordDetectionConnection {
// TODO: (b/181842909) Report an error to voice interactor // TODO: (b/181842909) Report an error to voice interactor
Slog.w(TAG, "Failed to updateState for HotwordDetectionService", e); Slog.w(TAG, "Failed to updateState for HotwordDetectionService", e);
} }
return future; return future.orTimeout(MAX_UPDATE_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
}).orTimeout(MAX_UPDATE_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS) }).whenComplete((res, err) -> {
.whenComplete((res, err) -> { if (err instanceof TimeoutException) {
if (err instanceof TimeoutException) { Slog.w(TAG, "updateState timed out");
Slog.w(TAG, "updateState timed out"); if (mUpdateStateAfterStartFinished.getAndSet(true)) {
if (mUpdateStateAfterStartFinished.getAndSet(true)) { return;
return; }
} try {
try { mCallback.onStatusReported(INITIALIZATION_STATUS_UNKNOWN);
mCallback.onStatusReported(INITIALIZATION_STATUS_UNKNOWN); HotwordMetricsLogger.writeServiceInitResultEvent(mDetectorType,
HotwordMetricsLogger.writeServiceInitResultEvent(mDetectorType, METRICS_INIT_UNKNOWN_TIMEOUT);
METRICS_INIT_UNKNOWN_TIMEOUT); } catch (RemoteException e) {
} catch (RemoteException e) { Slog.w(TAG, "Failed to report initialization status UNKNOWN", e);
Slog.w(TAG, "Failed to report initialization status UNKNOWN", e); HotwordMetricsLogger.writeServiceInitResultEvent(mDetectorType,
HotwordMetricsLogger.writeServiceInitResultEvent(mDetectorType, METRICS_INIT_CALLBACK_STATE_ERROR);
METRICS_INIT_CALLBACK_STATE_ERROR); }
} } else if (err != null) {
} else if (err != null) { Slog.w(TAG, "Failed to update state: " + err);
Slog.w(TAG, "Failed to update state: " + err); } else {
} else { // NOTE: so far we don't need to take any action.
// NOTE: so far we don't need to take any action. }
} });
});
} }
private static Pair<Integer, Integer> getInitStatusAndMetricsResult(Bundle bundle) { private static Pair<Integer, Integer> getInitStatusAndMetricsResult(Bundle bundle) {