tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix VTS test for health HAL 2.1"

Browse source
This commit is contained in:
Treehugger Robot 2020-02-16 00:16:05 +00:00 committed by Gerrit Code Review
commit 0935243c44
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
current.txt
View file

@ -616,7 +616,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

3
health/2.1/types.hal
View file

@ -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;
};

14
health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp
View file

@ -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";
})));
}