From ab3a3f8c02503f8a53a14f6b3f413e0cf739c957 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Wed, 3 Apr 2019 16:16:14 -0700 Subject: [PATCH 1/2] Revert "Revert "Mute haptic channels by default."" This reverts commit e6243996efb90d6e9dd0b855aa47c8795cf4ba9f. Bug: 129721367 Test: change volume in Play Music --- 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. */ From 9b0bb840cd082822487e6cfe8c4470ce928d7531 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Wed, 3 Apr 2019 16:41:39 -0700 Subject: [PATCH 2/2] fix AudioAttributes matching rule in AudioProductStrategy The matching rule on audio attributes flags must be that ALL flags set in the reference attributes are present in the compared attributes and not just some flags. Bug: 129721367 Test: change volume in Play Music Change-Id: I462fd73fb9b78b094411c6f3b52004349f49bcf3 --- media/java/android/media/audiopolicy/AudioProductStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/java/android/media/audiopolicy/AudioProductStrategy.java b/media/java/android/media/audiopolicy/AudioProductStrategy.java index 48500e01e86ab..c1c255f68996a 100644 --- a/media/java/android/media/audiopolicy/AudioProductStrategy.java +++ b/media/java/android/media/audiopolicy/AudioProductStrategy.java @@ -262,7 +262,7 @@ public final class AudioProductStrategy implements Parcelable { || (attr.getContentType() == refAttr.getContentType())) && ((refAttr.getAllFlags() == 0) || (attr.getAllFlags() != 0 - && (attr.getAllFlags() & refAttr.getAllFlags()) == attr.getAllFlags())) + && (attr.getAllFlags() & refAttr.getAllFlags()) == refAttr.getAllFlags())) && ((refFormattedTags.length() == 0) || refFormattedTags.equals(cliFormattedTags)); }