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

Commit 957680b7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix Vibrator and VibratorManager public API docs" into sc-dev am: 1d55488d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13671772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I333321bad888df8c3760e6c3851a26b723e5422c
parents a941e341 1d55488d

core/java/android/os/Vibrator.java

+2 −1
Original line number Diff line number Diff line
@@ -186,7 +186,8 @@ public abstract class Vibrator { 
    /**

     * Return the ID of this vibrator.

     *

     * @return The id of the vibrator controlled by this service.

     * @return A non-negative integer representing the id of the vibrator controlled by this

     * service, or -1 this service is not attached to any physical vibrator.

     */

    public int getId() {

        return -1;

core/java/android/os/VibratorManager.java

+3 −3
Original line number Diff line number Diff line
@@ -91,10 +91,10 @@ public abstract class VibratorManager { 
     *

     * <p>

     * Pass in a {@link CombinedVibrationEffect} representing a combination of {@link

     * VibrationEffect} to be played on one or more vibrators.

     * VibrationEffect VibrationEffects} to be played on one or more vibrators.

     * </p>

     *

     * @param effect an array of longs of times for which to turn the vibrator on or off.

     * @param effect a combination of effects to be performed by one or more vibrators.

     */

    @RequiresPermission(android.Manifest.permission.VIBRATE)

    public final void vibrate(@NonNull CombinedVibrationEffect effect) {
@@ -109,7 +109,7 @@ public abstract class VibratorManager { 
     * VibrationEffect} to be played on one or more vibrators.

     * </p>

     *

     * @param effect     an array of longs of times for which to turn the vibrator on or off.

     * @param effect a combination of effects to be performed by one or more vibrators.

     * @param attributes {@link VibrationAttributes} corresponding to the vibration. For example,

     *                   specify {@link VibrationAttributes#USAGE_ALARM} for alarm vibrations or

     *                   {@link VibrationAttributes#USAGE_RINGTONE} for vibrations associated with