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

media/java/android/media/AudioAttributes.java

@@ -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

@@ -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}