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

Merge "Update hotword detection metrics." into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-18 16:52:02 +00:00
committed by Android (Google) Code Review
parent ff5b1369dd 95e2fcd838
commit 12404db03b
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ import static android.Manifest.permission.CAPTURE_AUDIO_HOTWORD;
import static android.Manifest.permission.RECORD_AUDIO; import static android.Manifest.permission.RECORD_AUDIO;
import static android.service.voice.HotwordDetectionService.AUDIO_SOURCE_EXTERNAL; import static android.service.voice.HotwordDetectionService.AUDIO_SOURCE_EXTERNAL;
import static android.service.voice.HotwordDetectionService.AUDIO_SOURCE_MICROPHONE; import static android.service.voice.HotwordDetectionService.AUDIO_SOURCE_MICROPHONE;
import static android.service.voice.HotwordDetectionService.INITIALIZATION_STATUS_SUCCESS;
import static android.service.voice.HotwordDetectionService.INITIALIZATION_STATUS_UNKNOWN; import static android.service.voice.HotwordDetectionService.INITIALIZATION_STATUS_UNKNOWN;
import static android.service.voice.HotwordDetectionService.KEY_INITIALIZATION_STATUS; import static android.service.voice.HotwordDetectionService.KEY_INITIALIZATION_STATUS;
@@ -330,15 +331,16 @@ final class HotwordDetectionConnection {
return new Pair<>(INITIALIZATION_STATUS_UNKNOWN, METRICS_INIT_UNKNOWN_NO_VALUE); return new Pair<>(INITIALIZATION_STATUS_UNKNOWN, METRICS_INIT_UNKNOWN_NO_VALUE);
} }
int status = bundle.getInt(KEY_INITIALIZATION_STATUS, INITIALIZATION_STATUS_UNKNOWN); int status = bundle.getInt(KEY_INITIALIZATION_STATUS, INITIALIZATION_STATUS_UNKNOWN);
if (status > HotwordDetectionService.getMaxCustomInitializationStatus() if (status > HotwordDetectionService.getMaxCustomInitializationStatus()) {
&& status != INITIALIZATION_STATUS_UNKNOWN) {
return new Pair<>(INITIALIZATION_STATUS_UNKNOWN, return new Pair<>(INITIALIZATION_STATUS_UNKNOWN,
METRICS_INIT_UNKNOWN_OVER_MAX_CUSTOM_VALUE); status == INITIALIZATION_STATUS_UNKNOWN
? METRICS_INIT_UNKNOWN_NO_VALUE
: METRICS_INIT_UNKNOWN_OVER_MAX_CUSTOM_VALUE);
} }
// TODO: should guard against negative here // TODO: should guard against negative here
int metricsResult = status == INITIALIZATION_STATUS_UNKNOWN int metricsResult = status == INITIALIZATION_STATUS_SUCCESS
? METRICS_INIT_CALLBACK_STATE_ERROR ? METRICS_INIT_CALLBACK_STATE_SUCCESS
: METRICS_INIT_CALLBACK_STATE_SUCCESS; : METRICS_INIT_CALLBACK_STATE_ERROR;
return new Pair<>(status, metricsResult); return new Pair<>(status, metricsResult);
} }