Merge 24Q4 (ab/12406339) into aosp-main-future

Bug: 370570306
Merged-In: Ib8fd53fa76fd1767d56653e0baae263d4f73c822
Change-Id: Id16e7523ff6a30343a81a917add30289872e32b9

srcs/android/sysprop/BackportedFixesProperties.sysprop

diff --git a/srcs/android/sysprop/BackportedFixesProperties.sysprop b/srcs/android/sysprop/BackportedFixesProperties.sysprop
new file mode 100644
index 0000000..be2ff98
--- /dev/null
+++ b/srcs/android/sysprop/BackportedFixesProperties.sysprop
@@ -0,0 +1,16 @@
+module: "android.sysprop.BackportedFixesProperties"
+owner: Platform
+
+# BitSet where the index of the bits are aliases for known issues that are backported and fixed on
+# the device.
+# Encoded as a long array containing a little-endian representation of a sequence of bits
+# as defined by java.util.BitSet.valueof(long[])
+#
+# The list 10,9 means alias 1,4,64 and 67 are fixed on this device.
+prop {
+    api_name: "alias_bitset"
+    type: LongList
+    scope: Public
+    access: Readonly
+    prop_name: "ro.build.backported_fixes.alias_bitset.long_list"
+}

srcs/android/sysprop/BluetoothProperties.sysprop

diff --git a/srcs/android/sysprop/BluetoothProperties.sysprop b/srcs/android/sysprop/BluetoothProperties.sysprop
index e307b79..d6b8e4f 100644
--- a/srcs/android/sysprop/BluetoothProperties.sysprop
+++ b/srcs/android/sysprop/BluetoothProperties.sysprop
@@ -380,6 +380,16 @@
     prop_name: "bluetooth.profile.gatt.enabled"
 }
 
+# Whether the Gaming Audio profile (GMAP) is enabled on this device.
+# Set by vendors overlay, read at Bluetooth initialization
+prop {
+    api_name: "isProfileGmapEnabled"
+    type: Boolean
+    scope: Public
+    access: Readonly
+    prop_name: "bluetooth.profile.gmap.enabled"
+}
+
 # Whether the Hearing Aid Profile (HAP) client role is enabled on this device.
 # Set by vendors overlay, read at Bluetooth initialization
 prop {

srcs/android/sysprop/MediaProperties.sysprop

diff --git a/srcs/android/sysprop/MediaProperties.sysprop b/srcs/android/sysprop/MediaProperties.sysprop
index 06890d1..f8f28ea 100644
--- a/srcs/android/sysprop/MediaProperties.sysprop
+++ b/srcs/android/sysprop/MediaProperties.sysprop
@@ -57,3 +57,10 @@
     scope: Public
     prop_name: "media.c2.hal.selection"
 }
+prop {
+    api_name: "codec2_remove_rendering_depth"
+    type: Boolean
+    access: Readonly
+    scope: Public
+    prop_name: "media.c2.remove_rendering_depth"
+}

srcs/api/PlatformProperties-current.txt

diff --git a/srcs/api/PlatformProperties-current.txt b/srcs/api/PlatformProperties-current.txt
index e54d05c..e78f2b1 100644
--- a/srcs/api/PlatformProperties-current.txt
+++ b/srcs/api/PlatformProperties-current.txt
@@ -8,6 +8,14 @@
   }
 }
 props {
+  module: "android.sysprop.BackportedFixesProperties"
+  prop {
+    api_name: "alias_bitset"
+    type: LongList
+    prop_name: "ro.build.backported_fixes.alias_bitset.long_list"
+  }
+}
+props {
   module: "android.sysprop.BluetoothProperties"
   prop {
     api_name: "dsa_transport_preference"
@@ -147,6 +155,10 @@
     prop_name: "bluetooth.profile.gatt.enabled"
   }
   prop {
+    api_name: "isProfileGmapEnabled"
+    prop_name: "bluetooth.profile.gmap.enabled"
+  }
+  prop {
     api_name: "isProfileHapClientEnabled"
     prop_name: "bluetooth.profile.hap.client.enabled"
   }
@@ -307,6 +319,10 @@
     enum_values: "aidl|hidl"
   }
   prop {
+    api_name: "codec2_remove_rendering_depth"
+    prop_name: "media.c2.remove_rendering_depth"
+  }
+  prop {
     api_name: "resolution_limit_32bit"
     type: Integer
     prop_name: "media.resolution.limit.32bit"