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

Merge changes from topic "fix_attributes_match"

Browse Source 
* changes:
  fix AudioAttributes matching rule in AudioProductStrategy
  Revert "Revert "Mute haptic channels by default.""
This commit is contained in:
TreeHugger Robot
2019-04-04 16:18:46 +00:00
committed by Android (Google) Code Review
parent 93ceee8684 9b0bb840cd
commit cae417b6f1
2 changed files with 3 additions and 3 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 mSource = MediaRecorder.AudioSource.AUDIO_SOURCE_INVALID;
private int mFlags = 0x0;
private boolean mMuteHapticChannels = false;
private boolean mMuteHapticChannels = true;
private HashSet<String> mTags = new HashSet<String>();
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.
*/

2
media/java/android/media/audiopolicy/AudioProductStrategy.java
View File

@@ -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));
}