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

Commit 162ac3ad authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

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

am: f83192de

Change-Id: Ifcc857bb35041357178dd58bb7ad462e22b27881
parents 0ca098c3 f83192de

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.

         */