Commit b7bfb365 authored by Andrei-Laurențiu Olteanu's avatar Andrei-Laurențiu Olteanu Committed by Commit Bot

[Telemetry SWX] Add battery-charge to available routines

Introduce missing battery charge routine to getAvailableRoutines.

Bug: b:162051831
Change-Id: I761175fe72d87d477e9e030696f44e624a6f5d5e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2436738Reviewed-by: default avatarTom Sepez <tsepez@chromium.org>
Reviewed-by: default avatarMahmoud Gawad <mgawad@google.com>
Reviewed-by: default avatarOleh Lamzin <lamzin@google.com>
Commit-Queue: Laurențiu Olteanu <lolteanu@google.com>
Cr-Commit-Position: refs/heads/master@{#811957}
parent a674d637
...@@ -94,6 +94,8 @@ base::Optional<health::mojom::DiagnosticRoutineEnum> Convert( ...@@ -94,6 +94,8 @@ base::Optional<health::mojom::DiagnosticRoutineEnum> Convert(
return health::mojom::DiagnosticRoutineEnum::kPrimeSearch; return health::mojom::DiagnosticRoutineEnum::kPrimeSearch;
case cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryDischarge: case cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryDischarge:
return health::mojom::DiagnosticRoutineEnum::kBatteryDischarge; return health::mojom::DiagnosticRoutineEnum::kBatteryDischarge;
case cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryCharge:
return health::mojom::DiagnosticRoutineEnum::kBatteryCharge;
default: default:
return base::nullopt; return base::nullopt;
} }
......
...@@ -275,6 +275,7 @@ enum DiagnosticRoutineEnum { ...@@ -275,6 +275,7 @@ enum DiagnosticRoutineEnum {
kDiskRead = 9, kDiskRead = 9,
kPrimeSearch = 10, kPrimeSearch = 10,
kBatteryDischarge = 11, kBatteryDischarge = 11,
kBatteryCharge = 12,
}; };
// Enumeration of each of the possible statuses for a diagnostics routine. // Enumeration of each of the possible statuses for a diagnostics routine.
......
...@@ -62,6 +62,7 @@ class DiagnosticsProxy { ...@@ -62,6 +62,7 @@ class DiagnosticsProxy {
[routineEnum.kDiskRead, 'disk-read'], [routineEnum.kDiskRead, 'disk-read'],
[routineEnum.kPrimeSearch, 'prime-search'], [routineEnum.kPrimeSearch, 'prime-search'],
[routineEnum.kBatteryDischarge, 'battery-discharge'], [routineEnum.kBatteryDischarge, 'battery-discharge'],
[routineEnum.kBatteryCharge, 'battery-charge'],
]); ]);
if (this.enumToRoutineName_.size !== routineEnum.MAX_VALUE + 1) { if (this.enumToRoutineName_.size !== routineEnum.MAX_VALUE + 1) {
......
...@@ -79,6 +79,7 @@ void TelemetryExtensionUiBrowserTest::SetUpOnMainThread() { ...@@ -79,6 +79,7 @@ void TelemetryExtensionUiBrowserTest::SetUpOnMainThread() {
cros_diagnostics::DiagnosticRoutineEnum::kDiskRead, cros_diagnostics::DiagnosticRoutineEnum::kDiskRead,
cros_diagnostics::DiagnosticRoutineEnum::kPrimeSearch, cros_diagnostics::DiagnosticRoutineEnum::kPrimeSearch,
cros_diagnostics::DiagnosticRoutineEnum::kBatteryDischarge, cros_diagnostics::DiagnosticRoutineEnum::kBatteryDischarge,
cros_diagnostics::DiagnosticRoutineEnum::kBatteryCharge,
}; };
chromeos::cros_healthd::FakeCrosHealthdClient::Get() chromeos::cros_healthd::FakeCrosHealthdClient::Get()
......
...@@ -67,6 +67,7 @@ UNTRUSTED_TEST('UntrustedDiagnosticsRequestAvailableRoutines', async () => { ...@@ -67,6 +67,7 @@ UNTRUSTED_TEST('UntrustedDiagnosticsRequestAvailableRoutines', async () => {
'disk-read', 'disk-read',
'prime-search', 'prime-search',
'battery-discharge', 'battery-discharge',
'battery-charge',
]); ]);
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment