Merge "Update LE Audio profile names to be in line with spec and implementation" into tm-dev am: aac800dc00aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libsysprop/+/17647317

Change-Id: I6bc34bacfa6d8df784f08d32ae727852cd97a6cb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 17 insertions, 17 deletions

diff --git a/srcs/android/sysprop/BluetoothProperties.sysprop b/srcs/android/sysprop/BluetoothProperties.sysprop
index b82dfb8..8bc8bb8 100644
--- a/srcs/android/sysprop/BluetoothProperties.sysprop
+++ b/srcs/android/sysprop/BluetoothProperties.sysprop
@@ -203,14 +203,14 @@ prop {
     prop_name: "bluetooth.profile.bap.broadcast.source.enabled"
 }
 
-# Whether the Basic Audio Profile (BAP) unicast server role is enabled on this device.
+# Whether the Basic Audio Profile (BAP) unicast client role is enabled on this device.
 # Set by vendors overlay, read at Bluetooth initialization
 prop {
-    api_name: "isProfileBapUnicastServerEnabled"
+    api_name: "isProfileBapUnicastClientEnabled"
     type: Boolean
     scope: Public
     access: Readonly
-    prop_name: "bluetooth.profile.bap.unicast.server.enabled"
+    prop_name: "bluetooth.profile.bap.unicast.client.enabled"
 }
 
 # Whether the Battery Service profile (BAS) client role is enabled on this device.
@@ -393,22 +393,22 @@ prop {
     prop_name: "bluetooth.profile.sap.server.enabled"
 }
 
-# Whether the Telephone Bearer Service (TBS) server role is enabled on this device.
+# Whether the Call Control Profile (CCP) server role is enabled on this device.
 # Set by vendors overlay, read at Bluetooth initialization
 prop {
-    api_name: "isProfileTbsServerEnabled"
+    api_name: "isProfileCcpServerEnabled"
     type: Boolean
     scope: Public
     access: Readonly
-    prop_name: "bluetooth.profile.tbs.server.enabled"
+    prop_name: "bluetooth.profile.ccp.server.enabled"
 }
 
-# Whether the Volume Control Profile (VCP) server role is enabled on this device.
+# Whether the Volume Control Profile (VCP) controller role is enabled on this device.
 # Set by vendors overlay, read at Bluetooth initialization
 prop {
-    api_name: "isProfileVcServerEnabled"
+    api_name: "isProfileVcpControllerEnabled"
     type: Boolean
     scope: Public
     access: Readonly
-    prop_name: "bluetooth.profile.vc.server.enabled"
+    prop_name: "bluetooth.profile.vcp.controller.enabled"
 }
diff --git a/srcs/api/PlatformProperties-current.txt b/srcs/api/PlatformProperties-current.txt
index ebcd387..0bb7d72 100644
--- a/srcs/api/PlatformProperties-current.txt
+++ b/srcs/api/PlatformProperties-current.txt
@@ -81,8 +81,8 @@ props {
     prop_name: "bluetooth.profile.bap.broadcast.source.enabled"
   }
   prop {
-    api_name: "isProfileBapUnicastServerEnabled"
-    prop_name: "bluetooth.profile.bap.unicast.server.enabled"
+    api_name: "isProfileBapUnicastClientEnabled"
+    prop_name: "bluetooth.profile.bap.unicast.client.enabled"
   }
   prop {
     api_name: "isProfileBasClientEnabled"
@@ -93,6 +93,10 @@ props {
     prop_name: "bluetooth.profile.bass.client.enabled"
   }
   prop {
+    api_name: "isProfileCcpServerEnabled"
+    prop_name: "bluetooth.profile.ccp.server.enabled"
+  }
+  prop {
     api_name: "isProfileCsipSetCoordinatorEnabled"
     prop_name: "bluetooth.profile.csip.set_coordinator.enabled"
   }
@@ -157,12 +161,8 @@ props {
     prop_name: "bluetooth.profile.sap.server.enabled"
   }
   prop {
-    api_name: "isProfileTbsServerEnabled"
-    prop_name: "bluetooth.profile.tbs.server.enabled"
-  }
-  prop {
-    api_name: "isProfileVcServerEnabled"
-    prop_name: "bluetooth.profile.vc.server.enabled"
+    api_name: "isProfileVcpControllerEnabled"
+    prop_name: "bluetooth.profile.vcp.controller.enabled"
   }
   prop {
     api_name: "isSupportPersistedStateEnabled"