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

Commit f83192de authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Mute haptic channels by default.""" into qt-dev

parents 3b74731f c9d353dc

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.

         */