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

Commit cb1348d9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Setter and getter naming consistency for BluetoothCodecConfig" into main am: 55393964 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3001418



Change-Id: Ib02323615e080efd15c21a1a4c99479decc39863
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5a968a1b 55393964

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;

        }