commit 5d07cebba12a5ed5eda66cde3a35935b686a93c1
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 24 02:50:13 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 24 02:50:13 2023 +0000
tree ac32c0c54d743183f105c49e9910adc39a9becad
parent c2f025e250cdfdf72f778f491c24f4a3b3e6e348
parent 2d6557c0f74601ec52d6b70f4e74cc21261cf7e8

Merge "health: fix vts setChargingPolicy failing"

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, "") {