diff --git a/health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp b/health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp index d0b0d603c0..4ae443ad98 100644 --- a/health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp +++ b/health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp @@ -235,14 +235,15 @@ TEST_P(HealthHidlTest, getHealthInfo_2_1) { EXPECT_TRUE(IsEnum(value.batteryCapacityLevel)) << " BatteryCapacityLevel"; EXPECT_GE(value.batteryChargeTimeToFullNowSeconds, -1); - EXPECT_GE(value.batteryFullChargeDesignCapacityUah, 0) - << "batteryFullChargeDesignCapacityUah should not be negative"; + if (value.batteryFullChargeDesignCapacityUah != 0) { + EXPECT_GT((long)value.batteryFullChargeDesignCapacityUah, FULL_CHARGE_DESIGN_CAP_MIN) + << "batteryFullChargeDesignCapacityUah should be greater than 100 mAh, or 0 if " + "unknown"; - EXPECT_GT((long)value.batteryFullChargeDesignCapacityUah, FULL_CHARGE_DESIGN_CAP_MIN) - << "batteryFullChargeDesignCapacityUah should be greater than 100 mAh"; - - EXPECT_LT((long)value.batteryFullChargeDesignCapacityUah, FULL_CHARGE_DESIGN_CAP_MAX) - << "batteryFullChargeDesignCapacityUah should be less than 100,000 mAh"; + EXPECT_LT((long)value.batteryFullChargeDesignCapacityUah, FULL_CHARGE_DESIGN_CAP_MAX) + << "batteryFullChargeDesignCapacityUah should be less than 100,000 mAh, or 0 " + "if unknown"; + } }))); }