commit 81a8e67f791fdd3a44db3962773acb093979c949
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 18 11:53:03 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 18 11:53:03 2021 +0000
tree 97ae4ef1dc38ae10fbb1d40a36752c374a258fb4
parent ca264fbc59db10c96d1a0ab87c8a604b0bc1fe7a
parent c1d25eb84f03f65ab3501840747114e11e2d03c1

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

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