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

Merge "Revert "Revert "Mute haptic channels by default.""" into qt-dev

Browse Source
This commit is contained in:
Eric Laurent
2019-04-05 16:00:00 +00:00
committed by Android (Google) Code Review
parent 3b74731f4e c9d353dcf8
commit f83192de79
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -558,7 +558,7 @@ public final class AudioAttributes implements Parcelable {
private int mContentType = CONTENT_TYPE_UNKNOWN; private int mContentType = CONTENT_TYPE_UNKNOWN;
private int mSource = MediaRecorder.AudioSource.AUDIO_SOURCE_INVALID; private int mSource = MediaRecorder.AudioSource.AUDIO_SOURCE_INVALID;
private int mFlags = 0x0; private int mFlags = 0x0;
private boolean mMuteHapticChannels = false; private boolean mMuteHapticChannels = true;
private HashSet<String> mTags = new HashSet<String>(); private HashSet<String> mTags = new HashSet<String>();
private Bundle mBundle; private Bundle mBundle;
@@ -889,7 +889,7 @@ 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 enabled. * By default, haptic channels are disabled.
* @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.
*/ */