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

Commit 0dc5c7c4 authored by Henri Chataing's avatar Henri Chataing
Browse files

Flags 24Q4: Remove the flag a2dp_fix_codec_type_in_java 

Bug: 361742051
Test: m com.android.btservices
Flag: com.android.bluetooth.flags.a2dp_fix_codec_type_in_java
Change-Id: If02f63208931a5d0c0087da67fcc553fa3f8a7a3
parent 3a6a6fcd

flags/a2dp.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -78,16 +78,6 @@ flag { 
    }

}



flag {

    name: "a2dp_fix_codec_type_in_java"

    namespace: "bluetooth"

    description: "Mask out codec IDs such that they properly reflect unsigned value"

    bug: "361742051"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "fix_avdt_rconfig_not_setting_l2cap"

    namespace: "bluetooth"

framework/java/android/bluetooth/BluetoothCodecType.java

+3 −15
Original line number Diff line number Diff line
@@ -37,11 +37,7 @@ public final class BluetoothCodecType implements Parcelable { 


    private BluetoothCodecType(Parcel in) {

        mNativeCodecType = in.readInt();

        if (Flags.a2dpFixCodecTypeInJava()) {

        mCodecId = in.readLong() & 0xFFFFFFFFL;

        } else {

            mCodecId = in.readLong();

        }

        mCodecName = in.readString();

    }
@@ -75,11 +71,7 @@ public final class BluetoothCodecType implements Parcelable { 
     */

    private BluetoothCodecType(@BluetoothCodecConfig.SourceCodecType int codecType, long codecId) {

        mNativeCodecType = codecType;

        if (Flags.a2dpFixCodecTypeInJava()) {

        mCodecId = codecId & 0xFFFFFFFFL;

        } else {

            mCodecId = codecId;

        }

        mCodecName = BluetoothCodecConfig.getCodecName(codecType);

    }
@@ -94,11 +86,7 @@ public final class BluetoothCodecType implements Parcelable { 
    @SystemApi

    public BluetoothCodecType(int codecType, long codecId, @NonNull String codecName) {

        mNativeCodecType = codecType;

        if (Flags.a2dpFixCodecTypeInJava()) {

        mCodecId = codecId & 0xFFFFFFFFL;

        } else {

            mCodecId = codecId;

        }

        mCodecName = codecName;

    }