From: Zach Johnson <zachoverflow@google.com>
Date: Mon, 24 Aug 2020 21:59:57 +0000 (-0700)
Subject: Remove sys id param from bta_ar_reg_avrc
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=03b9958d8ec151b3069871bfef672bb58ca86f6b;p=android-x86%2Fsystem-bt.git

Remove sys id param from bta_ar_reg_avrc

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6431ab480e7f245e7131419bea76cc6b0c925352
---

diff --git a/bta/ar/bta_ar.cc b/bta/ar/bta_ar.cc
index bc41886a1..7beebaacb 100644
--- a/bta/ar/bta_ar.cc
+++ b/bta/ar/bta_ar.cc
@@ -190,12 +190,11 @@ void bta_ar_dereg_avct() {
  *****************************************************************************/
 void bta_ar_reg_avrc(uint16_t service_uuid, const char* service_name,
                      const char* provider_name, uint16_t categories,
-                     tBTA_SYS_ID sys_id, bool browse_supported,
-                     uint16_t profile_version) {
-  uint8_t mask = bta_ar_id(sys_id);
+                     bool browse_supported, uint16_t profile_version) {
+  uint8_t mask = BTA_AR_AV_MASK;
   uint8_t temp[8], *p;
 
-  if (!mask || !categories) return;
+  if (!categories) return;
 
   if (service_uuid == UUID_SERVCLASS_AV_REM_CTRL_TARGET) {
     if (bta_ar_cb.sdp_tg_handle == 0) {
diff --git a/bta/av/bta_av_main.cc b/bta/av/bta_av_main.cc
index c07804e93..5473af400 100644
--- a/bta/av/bta_av_main.cc
+++ b/bta/av/bta_av_main.cc
@@ -589,7 +589,7 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) {
 
         bta_ar_reg_avrc(
             UUID_SERVCLASS_AV_REM_CTRL_TARGET, "AV Remote Control Target", NULL,
-            p_bta_av_cfg->avrc_tg_cat, BTA_ID_AV,
+            p_bta_av_cfg->avrc_tg_cat,
             (bta_av_cb.features & BTA_AV_FEAT_BROWSE), profile_version);
       }
 
@@ -726,12 +726,12 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) {
          */
         if (profile_initialized == UUID_SERVCLASS_AUDIO_SOURCE) {
           bta_ar_reg_avrc(UUID_SERVCLASS_AV_REMOTE_CONTROL, NULL, NULL,
-                          p_bta_av_cfg->avrc_ct_cat, BTA_ID_AV,
+                          p_bta_av_cfg->avrc_ct_cat,
                           (bta_av_cb.features & BTA_AV_FEAT_BROWSE),
                           AVRC_REV_1_3);
         } else if (profile_initialized == UUID_SERVCLASS_AUDIO_SINK) {
           bta_ar_reg_avrc(UUID_SERVCLASS_AV_REMOTE_CONTROL, NULL, NULL,
-                          p_bta_av_cfg->avrc_ct_cat, BTA_ID_AV,
+                          p_bta_av_cfg->avrc_ct_cat,
                           (bta_av_cb.features & BTA_AV_FEAT_BROWSE),
                           AVRC_REV_1_6);
         }
diff --git a/bta/include/bta_ar_api.h b/bta/include/bta_ar_api.h
index eb951bdab..cf6de7c08 100644
--- a/bta/include/bta_ar_api.h
+++ b/bta/include/bta_ar_api.h
@@ -122,8 +122,7 @@ extern void bta_ar_dereg_avct();
  *****************************************************************************/
 extern void bta_ar_reg_avrc(uint16_t service_uuid, const char* p_service_name,
                             const char* p_provider_name, uint16_t categories,
-                            tBTA_SYS_ID sys_id, bool browse_supported,
-                            uint16_t profile_version);
+                            bool browse_supported, uint16_t profile_version);
 
 /******************************************************************************
  *