Merge 24Q4 into AOSP main

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

srcs/android/sysprop/BluetoothProperties.sysprop

diff --git a/srcs/android/sysprop/BluetoothProperties.sysprop b/srcs/android/sysprop/BluetoothProperties.sysprop
index 6d987b9..543da44 100644
--- a/srcs/android/sysprop/BluetoothProperties.sysprop
+++ b/srcs/android/sysprop/BluetoothProperties.sysprop
@@ -862,7 +862,7 @@
     type: Boolean
     scope: Public
     access: Readonly
-    prop_name: "bluetooth.sniff_offload.enabled"
+    prop_name: "persist.bluetooth.sniff_offload.enabled"
     integer_as_bool: true
 }
 

srcs/android/sysprop/TelephonyProperties.sysprop

diff --git a/srcs/android/sysprop/TelephonyProperties.sysprop b/srcs/android/sysprop/TelephonyProperties.sysprop
index 15999e7..e74f450 100644
--- a/srcs/android/sysprop/TelephonyProperties.sysprop
+++ b/srcs/android/sysprop/TelephonyProperties.sysprop
@@ -312,7 +312,7 @@
 
 #
 # Set to false to disable SMS receiving, default is
-# the value of config_sms_capable
+# the value of TelephonyManager.isDeviceSmsCapable()
 # Indexed by phone ID
 #
 prop {
@@ -325,7 +325,7 @@
 
 #
 # Set to false to disable SMS sending, default is
-# the value of config_sms_capable
+# the value of TelephonyManager.isDeviceSmsCapable()
 # Indexed by phone ID
 #
 prop {

srcs/api/PlatformProperties-current.txt

diff --git a/srcs/api/PlatformProperties-current.txt b/srcs/api/PlatformProperties-current.txt
index c5cfad2..e78f2b1 100644
--- a/srcs/api/PlatformProperties-current.txt
+++ b/srcs/api/PlatformProperties-current.txt
@@ -24,7 +24,7 @@
   }
   prop {
     api_name: "enable_sniff_offload"
-    prop_name: "bluetooth.sniff_offload.enabled"
+    prop_name: "persist.bluetooth.sniff_offload.enabled"
     integer_as_bool: true
   }
   prop {