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

Commit fe752fc2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Update doc for audio-coupled-haptic related stuff."

parents 609f7a65 60cf4a5b

media/java/android/media/AudioAttributes.java

+2 −0
Original line number Diff line number Diff line
@@ -1200,6 +1200,8 @@ public final class AudioAttributes implements Parcelable { 
        /**

         * Specifying if haptic should be muted or not when playing audio-haptic coupled data.

         * By default, haptic channels are disabled.

         * <p>This will be ignored if the caller doesn't have the

         * {@link android.Manifest.permission#VIBRATE} permission.

         * @param muted true to force muting haptic channels.

         * @return the same Builder instance.

         */

media/java/android/media/audiofx/HapticGenerator.java

+2 −1
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ public class HapticGenerator extends AudioEffect implements AutoCloseable { 
    }



    /**

     * Enable or disable the effect.

     * Enable or disable the effect. The effect can only be enabled if the caller has the

     * {@link android.Manifest.permission#VIBRATE} permission.

     *

     * @param enabled the requested enable state

     * @return {@link #SUCCESS} in case of success, {@link #ERROR_INVALID_OPERATION}