Merge "Update LE Audio profile names to be in line with spec and implementation" into tm-dev am: aac800dc00 am: f54964c7a2android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-release

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

Change-Id: I689fa8f329b6d6f158d2359055c772caf4c2f31d
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"