From 2d6557c0f74601ec52d6b70f4e74cc21261cf7e8 Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Tue, 21 Mar 2023 20:17:01 +0800 Subject: [PATCH] health: fix vts setChargingPolicy failing Bug: 274308314 Test: m android.hardware.health-update-api Change-Id: I0f1a41d86d6998f061a29a51b9d1cf43a47949c2 Signed-off-by: Jack Wu --- health/aidl/vts/functional/VtsHalHealthTargetTest.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/health/aidl/vts/functional/VtsHalHealthTargetTest.cpp b/health/aidl/vts/functional/VtsHalHealthTargetTest.cpp index 69d4789727..783ce11d69 100644 --- a/health/aidl/vts/functional/VtsHalHealthTargetTest.cpp +++ b/health/aidl/vts/functional/VtsHalHealthTargetTest.cpp @@ -257,7 +257,7 @@ TEST_P(HealthAidl, setChargingPolicy) { BatteryChargingPolicy value; /* set ChargingPolicy*/ - status = health->setChargingPolicy(static_cast(2)); // LONG_LIFE + status = health->setChargingPolicy(BatteryChargingPolicy::LONG_LIFE); ASSERT_THAT(status, AnyOf(IsOk(), ExceptionIs(EX_UNSUPPORTED_OPERATION))); if (!status.isOk()) return; @@ -265,7 +265,9 @@ TEST_P(HealthAidl, setChargingPolicy) { status = health->getChargingPolicy(&value); ASSERT_THAT(status, AnyOf(IsOk(), ExceptionIs(EX_UNSUPPORTED_OPERATION))); if (!status.isOk()) return; - ASSERT_THAT(static_cast(value), Eq(2)); + // the result of getChargingPolicy will be one of default(1), ADAPTIVE_AON(2) + // ADAPTIVE_AC(3) or LONG_LIFE(4). default(1) means NOT_SUPPORT + ASSERT_THAT(static_cast(value), AnyOf(Eq(1), Eq(4))); } MATCHER(IsValidHealthData, "") {