Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update doc for audio-coupled-haptic related stuff." am: fe752fc2b4 am: 1fe0a419aa am: 4ce721d428 am: eddf6d85c2

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

Change-Id: Ifed67552955d00b8ce020859346c4daee3debe14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-07-08 00:36:04 +00:00
committed by Automerger Merge Worker
parent cbfeb8d495 eddf6d85c2
commit 416d479225
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/AudioAttributes.java
View File

@@ -1286,6 +1286,8 @@ public final class AudioAttributes implements Parcelable {
/** /**
* Specifying if haptic should be muted or not when playing audio-haptic coupled data. * Specifying if haptic should be muted or not when playing audio-haptic coupled data.
* By default, haptic channels are disabled. * 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. * @param muted true to force muting haptic channels.
* @return the same Builder instance. * @return the same Builder instance.
*/ */

3
media/java/android/media/audiofx/HapticGenerator.java
View File

@@ -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 * @param enabled the requested enable state
* @return {@link #SUCCESS} in case of success, {@link #ERROR_INVALID_OPERATION} * @return {@link #SUCCESS} in case of success, {@link #ERROR_INVALID_OPERATION}