From 149320003e99b0d4a4f43dfe1f69387c6c8388ae Mon Sep 17 00:00:00 2001 From: Lais Andrade Date: Wed, 16 Jun 2021 13:37:37 +0100 Subject: [PATCH] Fix vibrator VTS failure on older HAL versions Fixing tests missed by ag/14937086. Fix: 186481596 Test: VtsHalVibratorTargetTest Change-Id: Ib4b4885a99effb6c010573146f5b016872f7a202 --- vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp b/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp index 4d49a12661..c56bd9a4d4 100644 --- a/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp +++ b/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp @@ -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; } }