Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cae417b6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "fix_attributes_match" 

* changes:
  fix AudioAttributes matching rule in AudioProductStrategy
  Revert "Revert "Mute haptic channels by default.""
parents 93ceee86 9b0bb840

media/java/android/media/AudioAttributes.java

+2 −2
Original line number Diff line number Diff line
@@ -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.

         */

media/java/android/media/audiopolicy/AudioProductStrategy.java

+1 −1
Original line number Diff line number Diff line
@@ -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));

    }