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

Commit 842bbe00 authored by Lais Andrade's avatar Lais Andrade Committed by Automerger Merge Worker
Browse files

Merge "Update Vibrator documentation for support check methods." am:... 

Merge "Update Vibrator documentation for support check methods." am: 669bfab5 am: aef7473d am: ee6ef24c

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



Change-Id: I32de34c1e992ad30297bea40aaaa23a9259f1537
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 67792341 ee6ef24c

core/java/android/os/Vibrator.java

+7 −4
Original line number Diff line number Diff line
@@ -519,7 +519,8 @@ public abstract class Vibrator { 
    }



    /**

     * Query whether the vibrator supports all the given effects.

     * Query whether the vibrator supports all the given effects. If no argument is provided this

     * method will always return {@link #VIBRATION_EFFECT_SUPPORT_YES}.

     *

     * <p>If an effect is not supported, the system may still automatically fall back to a simpler

     * vibration instead, which is not optimised for the specific device, however vibration isn't
@@ -541,7 +542,8 @@ public abstract class Vibrator { 
     * <p>Use {@link #areEffectsSupported(int...)} to get individual results for each effect.

     *

     * @param effectIds Which effects to query for.

     * @return Whether all the effects are natively supported by the device.

     * @return Whether all specified effects are natively supported by the device. Empty query

     * defaults to {@link #VIBRATION_EFFECT_SUPPORT_YES}.

     */

    @VibrationEffectSupport

    public final int areAllEffectsSupported(
@@ -590,7 +592,8 @@ public abstract class Vibrator { 
    }



    /**

     * Query whether the vibrator supports all of the given primitives.

     * Query whether the vibrator supports all of the given primitives.  If no argument is provided

     * this method will always return {@code true}.

     *

     * <p>If a primitive is not supported by the device, then <em>no vibration</em> will occur if

     * it is played.
@@ -598,7 +601,7 @@ public abstract class Vibrator { 
     * <p>Use {@link #arePrimitivesSupported(int...)} to get individual results for each primitive.

     *

     * @param primitiveIds Which primitives to query for.

     * @return Whether all specified primitives are supported.

     * @return Whether all specified primitives are supported. Empty query defaults to {@code true}.

     */

    public final boolean areAllPrimitivesSupported(

            @NonNull @VibrationEffect.Composition.PrimitiveType int... primitiveIds) {