commit 2d6557c0f74601ec52d6b70f4e74cc21261cf7e8
author Jack Wu <wjack@google.com> Tue Mar 21 20:17:01 2023 +0800
committer Jack Wu <wjack@google.com> Thu Mar 23 12:01:22 2023 +0000
tree 44a6672fc237a2deb619b24253264943372e348e
parent 45322523239190ff8df4c42463f66127f2499ee0

health: fix vts setChargingPolicy failing

Bug: 274308314
Test: m android.hardware.health-update-api
Change-Id: I0f1a41d86d6998f061a29a51b9d1cf43a47949c2
Signed-off-by: Jack Wu <wjack@google.com>

health/aidl/vts/functional/VtsHalHealthTargetTest.cpp

diff --git a/health/aidl/vts/functional/VtsHalHealthTargetTest.cpp b/health/aidl/vts/functional/VtsHalHealthTargetTest.cpp
index 69d4789..783ce11 100644
--- a/health/aidl/vts/functional/VtsHalHealthTargetTest.cpp
+++ b/health/aidl/vts/functional/VtsHalHealthTargetTest.cpp
@@ -257,7 +257,7 @@
     BatteryChargingPolicy value;
 
     /* set ChargingPolicy*/
-    status = health->setChargingPolicy(static_cast<BatteryChargingPolicy>(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 @@
     status = health->getChargingPolicy(&value);
     ASSERT_THAT(status, AnyOf(IsOk(), ExceptionIs(EX_UNSUPPORTED_OPERATION)));
     if (!status.isOk()) return;
-    ASSERT_THAT(static_cast<int>(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<int>(value), AnyOf(Eq(1), Eq(4)));
 }
 
 MATCHER(IsValidHealthData, "") {