commit 86623babea87a07a15dd0d5bf94810afaeac1c83
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 28 22:02:38 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 28 22:02:38 2020 +0000
tree bdde7bf291f56fb652fb0b0f1785772eee007045
parent dc428a6b0d564115adc688b417ff5ecefd0c51ff
parent afb2dc8a41f089ccaf59eff55794d16d00c65700

Merge "health 2.0 vts: Allow for battery-less devices" am: c9d0f25cfa am: 425f44da54 am: afb2dc8a41

Change-Id: I6023d7e975799ccbed31169d4009e9e14255a841

health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp

diff --git a/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp b/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp
index 49891b7..352a990 100644
--- a/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp
+++ b/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp
@@ -315,9 +315,7 @@
 TEST_P(HealthHidlTest, getChargeStatus) {
     SKIP_IF_SKIPPED();
     EXPECT_OK(mHealth->getChargeStatus([](auto result, auto value) {
-        EXPECT_VALID_OR_UNSUPPORTED_PROP(
-            result, toString(value),
-            value != BatteryStatus::UNKNOWN && verifyEnum<BatteryStatus>(value));
+        EXPECT_VALID_OR_UNSUPPORTED_PROP(result, toString(value), verifyEnum<BatteryStatus>(value));
     }));
 }