commit 149320003e99b0d4a4f43dfe1f69387c6c8388ae
author Lais Andrade <lsandrade@google.com> Wed Jun 16 13:37:37 2021 +0100
committer Lais Andrade <lsandrade@google.com> Wed Jun 16 13:37:37 2021 +0100
tree a1239ba20c2574e84228886bf277c4c56a36e2d5
parent e1aa9206594c50144759a5b95051c2c9f9022a97

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

diff --git a/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp b/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp
index 4d49a12..c56bd9a 100644
--- a/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp
+++ b/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp
@@ -309,8 +309,8 @@
         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 @@
         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;
     }
 }