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

Commit d35a17e6 authored by jiabin's avatar jiabin Committed by android-build-merger
Browse files

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

am: de2861cf

Change-Id: Idfc8b71e2b611cb74bad08b3aa8b95ea79f291cf
parents 43d53ce3 de2861cf
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -23079,8 +23079,8 @@ package android.media {
    method @NonNull public android.media.AudioAttributes.Builder setAllowedCapturePolicy(int);
    method public android.media.AudioAttributes.Builder setContentType(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 setMuteHapticChannels(boolean);
    method public android.media.AudioAttributes.Builder setUsage(int);
  }
+1 −1
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ public final class AudioAttributes implements Parcelable {
         * @param muted true to force muting haptic channels.
         * @return the same Builder instance.
         */
        public Builder setMuteHapticChannels(boolean muted) {
        public @NonNull Builder setHapticChannelsMuted(boolean muted) {
            mMuteHapticChannels = muted;
            return this;
        }