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

2 files changed, 3 insertions, 25 deletions

diff --git a/flags/a2dp.aconfig b/flags/a2dp.aconfig
index 69fe627a6e..0850077729 100644
--- a/flags/a2dp.aconfig
+++ b/flags/a2dp.aconfig
@@ -79,16 +79,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"
     description: "Set L2CAP flushable and high priority after A2DP reconfigure"
diff --git a/framework/java/android/bluetooth/BluetoothCodecType.java b/framework/java/android/bluetooth/BluetoothCodecType.java
index 6bd5045c56..54547fe3f5 100644
--- a/framework/java/android/bluetooth/BluetoothCodecType.java
+++ b/framework/java/android/bluetooth/BluetoothCodecType.java
@@ -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();
-        }
+        mCodecId = in.readLong() & 0xFFFFFFFFL;
         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;
-        }
+        mCodecId = codecId & 0xFFFFFFFFL;
         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;
-        }
+        mCodecId = codecId & 0xFFFFFFFFL;
         mCodecName = codecName;
     }