From e6243996efb90d6e9dd0b855aa47c8795cf4ba9f Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Tue, 2 Apr 2019 18:34:23 -0700 Subject: [PATCH] Revert "Mute haptic channels by default." This reverts commit 48af5aeeba37112821eab0869ea8274612798c6f. No idea on how this simple CL can cause this problem but A/B tests and bisection show that the problem disabpears when reverted. Bug: 129721367 Test: no repro on build with revert. Change-Id: I13e3d788d255c4b6e873bb1e9ce2cf92d2a18e41 --- 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 bf1063d0907ff..a3eee0a67d56a 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -557,7 +557,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 = true; + private boolean mMuteHapticChannels = false; private HashSet mTags = new HashSet(); 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. - * By default, haptic channels are disabled. + * By default, haptic channels are enabled. * @param muted true to force muting haptic channels. * @return the same Builder instance. */