From c9d353dcf8d7d6c2216353bc65977a5349796c09 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Wed, 3 Apr 2019 16:16:14 -0700 Subject: [PATCH] Revert "Revert "Mute haptic channels by default."" This reverts commit e6243996efb90d6e9dd0b855aa47c8795cf4ba9f. Bug: 129721367 Test: change volume in Play Music (cherry picked from commit ab3a3f8c02503f8a53a14f6b3f413e0cf739c957) Change-Id: Id6e63e87265717130dde0e1b46e28edbb0b53edb --- media/java/android/media/AudioAttributes.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index 55f1911119f42..3a336780b4654 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -558,7 +558,7 @@ public final class AudioAttributes implements Parcelable { private int mContentType = CONTENT_TYPE_UNKNOWN; private int mSource = MediaRecorder.AudioSource.AUDIO_SOURCE_INVALID; private int mFlags = 0x0; - private boolean mMuteHapticChannels = false; + private boolean mMuteHapticChannels = true; private HashSet mTags = new HashSet(); 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. - * By default, haptic channels are enabled. + * By default, haptic channels are disabled. * @param muted true to force muting haptic channels. * @return the same Builder instance. */