Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22646c2f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "vibrator: vts: correct the checking flag when testing on() interfaces"... 

Merge "vibrator: vts: correct the checking flag when testing on() interfaces" am: 321618f7 am: 47c899b6 am: 8bb44c34

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

Change-Id: I96e20cea13eb8ec3314838aecef4afe6f831db72
parents 979039a4 8bb44c34

vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ TEST_P(VibratorAidl, OnThenOffBeforeTimeout) { 
}



TEST_P(VibratorAidl, OnWithCallback) {

    if (!(capabilities & IVibrator::CAP_PERFORM_CALLBACK)) return;

    if (!(capabilities & IVibrator::CAP_ON_CALLBACK)) return;



    std::promise<void> completionPromise;

    std::future<void> completionFuture{completionPromise.get_future()};
@@ -130,7 +130,7 @@ TEST_P(VibratorAidl, OnWithCallback) { 
}



TEST_P(VibratorAidl, OnCallbackNotSupported) {

    if (!(capabilities & IVibrator::CAP_PERFORM_CALLBACK)) {

    if (!(capabilities & IVibrator::CAP_ON_CALLBACK)) {

        sp<CompletionCallback> callback = new CompletionCallback([] {});

        EXPECT_EQ(Status::EX_UNSUPPORTED_OPERATION, vibrator->on(250, callback).exceptionCode());

    }