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

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

Merge "Fix default vibrator HAL to check support on getPrimitiveDuration" am: 6738af59 

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

Change-Id: If4776ba2e09b282096c651d41607fc8e898a1578
parents a43ffc12 6738af59

vibrator/aidl/default/Vibrator.cpp

+5 −0
Original line number Diff line number Diff line
@@ -125,6 +125,11 @@ ndk::ScopedAStatus Vibrator::getSupportedPrimitives(std::vector<CompositePrimiti 


ndk::ScopedAStatus Vibrator::getPrimitiveDuration(CompositePrimitive primitive,

                                                  int32_t* durationMs) {

    std::vector<CompositePrimitive> supported;

    getSupportedPrimitives(&supported);

    if (std::find(supported.begin(), supported.end(), primitive) == supported.end()) {

        return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);

    }

    if (primitive != CompositePrimitive::NOOP) {

        *durationMs = 100;

    } else {