| commit | e0edb603968e169e9defecef531abe927e817cd3 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 22 01:25:19 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 22 01:25:19 2022 +0000 |
| tree | 960cf918cbdf2fa5c971f246c6e8e775bcacc2f3 | |
| parent | 348c5d2d3254f9bcc0d02bc0653f5269db75fc08 [diff] | |
| parent | 95468b09ba50605d5574ee4459abc73076e0ef8b [diff] |
Merge "Fix VtsHalVibratorManagerTargetTest test fail" into tm-qpr-dev am: d39f11cbb0 am: 62bee20d8e am: 95468b09ba Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19992878 Change-Id: I0ade24ba0add682023853edefd6b9312ddc0993d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/vibrator/aidl/vts/VtsHalVibratorManagerTargetTest.cpp b/vibrator/aidl/vts/VtsHalVibratorManagerTargetTest.cpp index 44fa3be..e8ed26a 100644 --- a/vibrator/aidl/vts/VtsHalVibratorManagerTargetTest.cpp +++ b/vibrator/aidl/vts/VtsHalVibratorManagerTargetTest.cpp
@@ -96,6 +96,7 @@ if (!(capabilities & IVibratorManager::CAP_SYNC)) return; if (vibratorIds.empty()) return; EXPECT_TRUE(manager->prepareSynced(vibratorIds).isOk()); + EXPECT_TRUE(manager->cancelSynced().isOk()); } TEST_P(VibratorAidl, PrepareSyncedEmptySetIsInvalid) { @@ -208,6 +209,7 @@ EXPECT_TRUE(manager->prepareSynced(vibratorIds).isOk()); Status status = manager->triggerSynced(callback); EXPECT_TRUE(isUnknownOrUnsupported(status)) << status; + EXPECT_TRUE(manager->cancelSynced().isOk()); } }