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

Commit 55393964 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Setter and getter naming consistency for BluetoothCodecConfig" into main

parents 0770a128 6a36745c

framework/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ package android.bluetooth { 
    method @NonNull public android.bluetooth.BluetoothCodecConfig.Builder setCodecSpecific3(long);

    method @NonNull public android.bluetooth.BluetoothCodecConfig.Builder setCodecSpecific4(long);

    method @Deprecated @NonNull public android.bluetooth.BluetoothCodecConfig.Builder setCodecType(int);

    method @FlaggedApi("com.android.bluetooth.flags.a2dp_offload_codec_extensibility") @NonNull public android.bluetooth.BluetoothCodecConfig.Builder setCodecType(@Nullable android.bluetooth.BluetoothCodecType);

    method @FlaggedApi("com.android.bluetooth.flags.a2dp_offload_codec_extensibility") @NonNull public android.bluetooth.BluetoothCodecConfig.Builder setExtendedCodecType(@Nullable android.bluetooth.BluetoothCodecType);

    method @NonNull public android.bluetooth.BluetoothCodecConfig.Builder setSampleRate(int);

  }

framework/java/android/bluetooth/BluetoothCodecConfig.java

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ public final class BluetoothCodecConfig implements Parcelable { 
         * @return the same Builder instance

         */

        @FlaggedApi(Flags.FLAG_A2DP_OFFLOAD_CODEC_EXTENSIBILITY)

        public @NonNull Builder setCodecType(@Nullable BluetoothCodecType codecType) {

        public @NonNull Builder setExtendedCodecType(@Nullable BluetoothCodecType codecType) {

            mCodecType = codecType;

            return this;

        }