Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80694d55 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "health VTS: Status::UNKNOWN is OK if not present"

parents 538d6526 ac5a0d31

health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp

+9 −3
Original line number Diff line number Diff line
@@ -257,15 +257,21 @@ bool verifyHealthInfo(const HealthInfo& health_info) { 
    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;

}