diff options
author | Yu-Hsuan Hsu <yuhsuan@chromium.org> | 2019-10-03 15:27:13 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-10-04 07:21:48 +0000 |
commit | 722c5f91943477cf0445e833601b5923228bb4d0 (patch) | |
tree | c536c00657fd3d1a3374a61fa0108a52d37cd3e5 /cras/src/server/cras_server_metrics.c | |
parent | 711fa6cc000b702e0c71f9844de410eb72c0b09b (diff) | |
download | adhd-722c5f91943477cf0445e833601b5923228bb4d0.tar.gz |
CRAS: cras_server_metrics - Fix some bugs about device type
Fix some mistakes about device type.
1. Replace CRAS_METRICS_DEVICE_NORMAL(ABNORMAL)_SILENT_HOTWORD with
CRAS_METRICS_DEVICE_SILENT_HOTWORD because the silent hotword should
always be in the normal situation.
2. Typo 'slient' -> 'silent'
3. Let CRAS_CLIENT_TYPE_SERVER_STREAM be converted to string.
BUG=b:141286272
TEST=These logs can be recorded correctly on eve.
Change-Id: I9d6cec57278db3f61df474d40ad1968443363f34
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/1836844
Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org>
Tested-by: Yu-Hsuan Hsu <yuhsuan@chromium.org>
Commit-Queue: Yu-Hsuan Hsu <yuhsuan@chromium.org>
Diffstat (limited to 'cras/src/server/cras_server_metrics.c')
-rw-r--r-- | cras/src/server/cras_server_metrics.c | 44 |
1 files changed, 15 insertions, 29 deletions
diff --git a/cras/src/server/cras_server_metrics.c b/cras/src/server/cras_server_metrics.c index ca169bec..5f51e83e 100644 --- a/cras/src/server/cras_server_metrics.c +++ b/cras/src/server/cras_server_metrics.c @@ -120,9 +120,8 @@ enum CRAS_METRICS_DEVICE_TYPE { CRAS_METRICS_DEVICE_BLUETOOTH, CRAS_METRICS_DEVICE_NO_DEVICE, CRAS_METRICS_DEVICE_NORMAL_FALLBACK, - CRAS_METRICS_DEVICE_NORMAL_SILENT_HOTWORD, CRAS_METRICS_DEVICE_ABNORMAL_FALLBACK, - CRAS_METRICS_DEVICE_ABNORMAL_SILENT_HOTWORD, + CRAS_METRICS_DEVICE_SILENT_HOTWORD, CRAS_METRICS_DEVICE_UNKNOWN, }; @@ -234,14 +233,13 @@ metrics_device_type_str(enum CRAS_METRICS_DEVICE_TYPE device_type) return "Bluetooth"; case CRAS_METRICS_DEVICE_NO_DEVICE: return "NoDevice"; + /* Other dummy devices. */ case CRAS_METRICS_DEVICE_NORMAL_FALLBACK: return "NormalFallback"; - case CRAS_METRICS_DEVICE_NORMAL_SILENT_HOTWORD: - return "NormalSlientHotword"; case CRAS_METRICS_DEVICE_ABNORMAL_FALLBACK: return "AbnormalFallback"; - case CRAS_METRICS_DEVICE_ABNORMAL_SILENT_HOTWORD: - return "AbnormalSlientHotword"; + case CRAS_METRICS_DEVICE_SILENT_HOTWORD: + return "SilentHotword"; case CRAS_METRICS_DEVICE_UNKNOWN: return "Unknown"; default: @@ -254,31 +252,19 @@ get_metrics_device_type(struct cras_iodev *iodev) { /* Check whether it is a special device. */ if (iodev->info.idx < MAX_SPECIAL_DEVICE_IDX) { - if (iodev->active_node->type == - CRAS_NODE_TYPE_FALLBACK_NORMAL) { - switch (iodev->info.idx) { - case NO_DEVICE: - syslog(LOG_ERR, - "The invalid device has been used."); - return CRAS_METRICS_DEVICE_NO_DEVICE; - case SILENT_RECORD_DEVICE: - case SILENT_PLAYBACK_DEVICE: + switch (iodev->info.idx) { + case NO_DEVICE: + syslog(LOG_ERR, "The invalid device has been used."); + return CRAS_METRICS_DEVICE_NO_DEVICE; + case SILENT_RECORD_DEVICE: + case SILENT_PLAYBACK_DEVICE: + if (iodev->active_node->type == + CRAS_NODE_TYPE_FALLBACK_NORMAL) return CRAS_METRICS_DEVICE_NORMAL_FALLBACK; - case SILENT_HOTWORD_DEVICE: - return CRAS_METRICS_DEVICE_NORMAL_SILENT_HOTWORD; - } - } else { - switch (iodev->info.idx) { - case NO_DEVICE: - syslog(LOG_ERR, - "The invalid device has been used."); - return CRAS_METRICS_DEVICE_NO_DEVICE; - case SILENT_RECORD_DEVICE: - case SILENT_PLAYBACK_DEVICE: + else return CRAS_METRICS_DEVICE_ABNORMAL_FALLBACK; - case SILENT_HOTWORD_DEVICE: - return CRAS_METRICS_DEVICE_ABNORMAL_SILENT_HOTWORD; - } + case SILENT_HOTWORD_DEVICE: + return CRAS_METRICS_DEVICE_SILENT_HOTWORD; } } |