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

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

Merge "Rename mute haptic channel API." into qt-dev

parents a4d6b780 3b18011b

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -23079,8 +23079,8 @@ package android.media { 
    method @NonNull public android.media.AudioAttributes.Builder setAllowedCapturePolicy(int);

    method @NonNull public android.media.AudioAttributes.Builder setAllowedCapturePolicy(int);

    method public android.media.AudioAttributes.Builder setContentType(int);

    method public android.media.AudioAttributes.Builder setContentType(int);

    method public android.media.AudioAttributes.Builder setFlags(int);

    method public android.media.AudioAttributes.Builder setFlags(int);

    method @NonNull public android.media.AudioAttributes.Builder setHapticChannelsMuted(boolean);

    method public android.media.AudioAttributes.Builder setLegacyStreamType(int);

    method public android.media.AudioAttributes.Builder setLegacyStreamType(int);

    method public android.media.AudioAttributes.Builder setMuteHapticChannels(boolean);

    method public android.media.AudioAttributes.Builder setUsage(int);

    method public android.media.AudioAttributes.Builder setUsage(int);

  }

  }































media/java/android/media/AudioAttributes.java



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -893,7 +893,7 @@ public final class AudioAttributes implements Parcelable {









         * @param muted true to force muting haptic channels.







         * @param muted true to force muting haptic channels.











         * @return the same Builder instance.







         * @return the same Builder instance.











         */







         */











        public Builder setMuteHapticChannels(boolean muted) {







        public @NonNull Builder setHapticChannelsMuted(boolean muted) {











            mMuteHapticChannels = muted;







            mMuteHapticChannels = muted;











            return this;







            return this;











        }







        }