Merge "Mute haptic channels by default." (2118cc30) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioAttributes.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -557,7 +557,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;

	@@ -888,7 +888,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.
	*/		*/