Update LE Audio profile names to be in line with spec and implementation

Bug: 217448211
Test: atest BluetoothInstrumentationTests
Change-Id: I9c90b56527e9cf4d6ac1669d389823d17214c32e

2 files changed, 17 insertions, 17 deletions

diff --git a/srcs/android/sysprop/BluetoothProperties.sysprop b/srcs/android/sysprop/BluetoothProperties.sysprop
index bee86c1..bde0623 100644
--- a/srcs/android/sysprop/BluetoothProperties.sysprop
+++ b/srcs/android/sysprop/BluetoothProperties.sysprop
@@ -193,14 +193,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.
@@ -383,22 +383,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 f44caab..9b5fb5a 100644
--- a/srcs/api/PlatformProperties-current.txt
+++ b/srcs/api/PlatformProperties-current.txt
@@ -77,8 +77,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"
@@ -89,6 +89,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"
   }
@@ -153,12 +157,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"