commit bccc499ab4db4995d15dbe91bfd8c677e6941d81
author Robin Lee <rgl@google.com> Wed Oct 16 04:06:46 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 16 04:06:46 2019 -0700
tree b8b31a7ef755a4fb9e6b1f2140782b1f8663c6c3
parent b09048562f115f96c66188e24e3c8104a02d6d17
parent 25293b508c6bf61f87c2f953c170d2914de18f78

Merge "health VTS: Status::UNKNOWN is OK if not present" am: 80694d55ca am: 1a62d3f189
am: 25293b508c

Change-Id: I4663cde466ba285172e90d77adb7807017af03fd

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 74fe4fb..6e13a98 100644
--- a/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp
+++ b/health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp
@@ -257,15 +257,21 @@
     using V1_0::BatteryStatus;
     using V1_0::BatteryHealth;
 
-    if (!((health_info.legacy.batteryChargeCounter > 0) &&
-          (health_info.legacy.batteryCurrent != INT32_MIN) &&
+    if (!((health_info.legacy.batteryCurrent != INT32_MIN) &&
           (0 <= health_info.legacy.batteryLevel && health_info.legacy.batteryLevel <= 100) &&
           verifyEnum<BatteryHealth>(health_info.legacy.batteryHealth) &&
-          (health_info.legacy.batteryStatus != BatteryStatus::UNKNOWN) &&
           verifyEnum<BatteryStatus>(health_info.legacy.batteryStatus))) {
         return false;
     }
 
+    if (health_info.legacy.batteryPresent) {
+        // If a battery is present, the battery status must be known.
+        if (!((health_info.legacy.batteryChargeCounter > 0) &&
+              (health_info.legacy.batteryStatus != BatteryStatus::UNKNOWN))) {
+            return false;
+        }
+    }
+
     return true;
 }