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

Commit a0c08bbd authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "vibrator: clarify behavior for repeated commands" am: ea49733b am: 3f92e552

am: 2b8ffb99

Change-Id: Ib18a2fde0b77029f678a7b5394b2e15868dd6d0d
parents 54e9ec9c 2b8ffb99
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ interface IVibrator {
    /**
     * Turn off vibrator
     *
     * Cancel a previously-started vibration, if any.
     * Cancel a previously-started vibration, if any. If a previously-started vibration is
     * associated with a callback, then onComplete should still be called on that callback.
     */
    void off();

@@ -62,6 +63,9 @@ interface IVibrator {
     * was canceled (through off()). A callback is only expected to be supported when
     * getCapabilities CAP_ON_CALLBACK is specified.
     *
     * Doing this operation while the vibrator is already on is undefined behavior. Clients should
     * explicitly call off.
     *
     * @param timeoutMs number of milliseconds to vibrate.
     * @param callback A callback used to inform Frameworks of state change, if supported.
     */
@@ -73,6 +77,9 @@ interface IVibrator {
     * A callback is only expected to be supported when getCapabilities CAP_PERFORM_CALLBACK
     * is specified.
     *
     * Doing this operation while the vibrator is already on is undefined behavior. Clients should
     * explicitly call off.
     *
     * @param effect The type of haptic event to trigger.
     * @param strength The intensity of haptic event to trigger.
     * @param callback A callback used to inform Frameworks of state change, if supported.