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

Commit 8ebff156 authored by Vince Leung's avatar Vince Leung Committed by Android (Google) Code Review
Browse files

Merge "vibrator: aidl: add primitive LOW_TICK"

parents d31e7448 deb46ec7

vibrator/aidl/aidl_api/android.hardware.vibrator/current/android/hardware/vibrator/CompositePrimitive.aidl

+1 −0
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ enum CompositePrimitive { 
  SLOW_RISE = 5,

  QUICK_FALL = 6,

  LIGHT_TICK = 7,

  LOW_TICK = 8,

}

vibrator/aidl/android/hardware/vibrator/CompositePrimitive.aidl

+7 −0
Original line number Diff line number Diff line
@@ -70,4 +70,11 @@ enum CompositePrimitive { 
     * Support is required.

     */

    LIGHT_TICK,

    /**

     * This very short low frequency effect should produce a light crisp sensation intended

     * to be used repetitively for dynamic feedback.

     *

     * Support is required.

     */

    LOW_TICK,

}

vibrator/aidl/default/Vibrator.cpp

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ ndk::ScopedAStatus Vibrator::getSupportedPrimitives(std::vector<CompositePrimiti 
            CompositePrimitive::THUD,       CompositePrimitive::SPIN,

            CompositePrimitive::QUICK_RISE, CompositePrimitive::SLOW_RISE,

            CompositePrimitive::QUICK_FALL, CompositePrimitive::LIGHT_TICK,

            CompositePrimitive::LOW_TICK,

    };

    return ndk::ScopedAStatus::ok();

}