Merge "Fix vibrator VTS failure on older HAL versions" into sc-dev am: c1d25eb84f

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14985778

Change-Id: I5278a85cfc0291be4ca4389422284f2550ec8c4e
This commit is contained in:
TreeHugger Robot
2021-06-18 11:53:03 +00:00
committed by Automerger Merge Worker

View File

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