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

Commit 20953a0b authored by Treehugger Robot's avatar Treehugger Robot
Browse files

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

Change-Id: Iea04d74cdbbc63bd80fc3b6bcd2692ef5150300d
parents 72e761e8 3458203c

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ ba5ac712b2a656dc07c83ab4a7a2c2f3bee1bbcb752e8b8ffa9b672f3b5b0728 android.hardwar 
a28d6c29a7e36976acffb018208e65b3496d9152d57d864038556cdd83b35744 android.hardware.gnss.measurement_corrections@1.1::types

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

    })));

}