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

Commit eddf6d85 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Update doc for audio-coupled-haptic related stuff." am: fe752fc2 am: 1fe0a419 am: 4ce721d4

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



Change-Id: Icf1bc86367fee722dd7838c767dc04911f7258eb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7be5a5d 4ce721d4

media/java/android/media/AudioAttributes.java

+2 −0
Original line number Diff line number Diff line
@@ -1286,6 +1286,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}