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

Commit 65a070de authored by Treehugger Robot's avatar Treehugger Robot
Browse files

Merge "Fix VTS test for health HAL 2.1" am: 0935243c 

Change-Id: Ibb4705efef6c6faa472dbd4fcd580d2185cdc1fa
parents f7e28409 0935243c

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ dd377f404a8e71f6191d295e10067db629b0f0c28e594af906f2bea5d87fe2cc android.hardwar 
f284ffde7cadf5a1364b75ab313baf22401eeca289bdde2a2dc7a27ea4ab98d7 android.hardware.dumpstate@1.1::IDumpstateDevice

ce8dbe76eb9ee94b46ef98f725be992e760a5751073d4f4912484026541371f3 android.hardware.health@2.1::IHealth

26f04510a0b57aba5167c5c0a7c2f077c2acbb98b81902a072517829fd9fd67f android.hardware.health@2.1::IHealthInfoCallback

30e5d878099aeca710420dfc438d115bbbdcdbe84ad1b05a0f5e01debc3ef3af android.hardware.health@2.1::types

3a4e7462a12589bd219599de59663d0ba9915313f45150774780d09f4e114f74 android.hardware.health@2.1::types

0589e410f519e36514e7ece18f283f022df0f70efd2c12821d822f67f74aba98 android.hardware.identity@1.0::types

bbeee9604128ede83ee755b67e73b5ad29e6e1dbac9ec41fea6ffe2745b0c50a android.hardware.identity@1.0::IIdentityCredential

96ce8aad80f4c476f25261f790d357c117e79e18474c7dadd850dac704bbe65e android.hardware.identity@1.0::IIdentityCredentialStore

health/2.1/types.hal

+2 −1
Original line number Diff line number Diff line
@@ -85,9 +85,10 @@ struct HealthInfo { 


    /**

     * Estimated battery full charge design capacity (in microamp hours, uAh).

     * batteryFullCharge must be less than (value * 1000).

     * Value must be 0 if unknown.

     * Value must be positive if known.

     * Value must be greater than 100 000 uAh.

     * Value must be less than 100 000 000 uAh.

     */

    int32_t batteryFullChargeDesignCapacityUah;

};

health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp

+8 −6
Original line number Diff line number Diff line
@@ -219,6 +219,9 @@ AssertionResult IsEnum(T value) { 
    return AssertionFailure() << static_cast<std::underlying_type_t<T>>(value) << " is not valid";

}



#define FULL_CHARGE_DESIGN_CAP_MIN ((long)100 * 1000)

#define FULL_CHARGE_DESIGN_CAP_MAX ((long)100000 * 1000)



/*

 * Tests the values returned by getHealthInfo() from interface IHealth.

 */
@@ -235,12 +238,11 @@ TEST_P(HealthHidlTest, getHealthInfo_2_1) { 
        EXPECT_GE(value.batteryFullChargeDesignCapacityUah, 0)

                << "batteryFullChargeDesignCapacityUah should not be negative";



        // Check for extreme outliers

        const auto& legacy = value.legacy.legacy;

        if (value.batteryFullChargeDesignCapacityUah > 0) {

            EXPECT_LT((long)legacy.batteryFullCharge,

                      ((long)value.batteryFullChargeDesignCapacityUah * 1000));

        }

        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";

    })));

}