Merge "Fix vibrator VTS failure on older HAL versions" into sc-dev
This commit is contained in:
commit
c1d25eb84f
1 changed files with 3 additions and 3 deletions
|
@ -309,8 +309,8 @@ TEST_P(VibratorAidl, InvalidEffectsUnsupported) {
|
|||
for (EffectStrength strength : kEffectStrengths) {
|
||||
int32_t lengthMs;
|
||||
Status status = vibrator->perform(effect, strength, nullptr /*callback*/, &lengthMs);
|
||||
EXPECT_EQ(status.exceptionCode(), Status::EX_UNSUPPORTED_OPERATION)
|
||||
<< toString(effect) << " " << toString(strength);
|
||||
EXPECT_TRUE(isUnknownOrUnsupported(status))
|
||||
<< status << toString(effect) << " " << toString(strength);
|
||||
}
|
||||
}
|
||||
for (Effect effect : kEffects) {
|
||||
|
@ -686,7 +686,7 @@ TEST_P(VibratorAidl, GetPwlePrimitiveDurationMax) {
|
|||
ASSERT_NE(durationMs, 0);
|
||||
EXPECT_EQ(status.exceptionCode(), Status::EX_NONE);
|
||||
} else {
|
||||
EXPECT_EQ(status.exceptionCode(), Status::EX_UNSUPPORTED_OPERATION);
|
||||
EXPECT_TRUE(isUnknownOrUnsupported(status)) << status;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue