HAP: Disable Hearing Aid Profile Support at runtime from config
This reverts commit f106def1b76b1917732e49014de7c3b349f6fe16.
CRs-Fixed: 2590585
Change-Id: I36d37b0d24b9497e40c612bad2712c4000a5e729
diff --git a/system_bt_ext/conf/bt_profile.conf b/system_bt_ext/conf/bt_profile.conf
index 27b49d8..d3fd677 100644
--- a/system_bt_ext/conf/bt_profile.conf
+++ b/system_bt_ext/conf/bt_profile.conf
@@ -8,7 +8,6 @@
# 2.PBAP
# 3.MAP
# 4.MAX_POW
-# 5.HEARING AID
#
# ******************************* Start of config Database *******************
#AVRCP profile and its configurable features
@@ -44,8 +43,3 @@
#BR_max_pow_support = 0x80
#EDR_max_pow_support = 0x80
BLE_max_pow_support = 0x18
-
-#Hearing Aid profile and its configurable features
-# hearing_aid_support with default value false
-[HEARING_AID]
-hearing_aid_support = false
\ No newline at end of file
diff --git a/system_bt_ext/device/src/profile_config.cc b/system_bt_ext/device/src/profile_config.cc
index 5193556..39c95d7 100644
--- a/system_bt_ext/device/src/profile_config.cc
+++ b/system_bt_ext/device/src/profile_config.cc
@@ -89,10 +89,6 @@
} map_feature_t;
typedef struct {
- char hap_support[VALUE_MAX_LENGTH];
-} hearing_aid_feature_t;
-
-typedef struct {
profile_t profile_id;
char *version;
@@ -101,7 +97,6 @@
pbap_feature_t pbap_feature_entry;
map_feature_t map_feature_entry;
max_pow_feature_t max_pow_feature_entry;
- hearing_aid_feature_t hearing_aid_support_entry;
} profile_feature_type;
} profile_db_entry_t;
@@ -126,7 +121,6 @@
CASE_RETURN_STR(PBAP_ID)
CASE_RETURN_STR(MAP_ID)
CASE_RETURN_STR(MAX_POW_ID)
- CASE_RETURN_STR(HEARING_AID_ID)
CASE_RETURN_STR(END_OF_PROFILE_LIST)
}
return "UNKNOWN";
@@ -145,7 +139,6 @@
CASE_RETURN_STR(BR_MAX_POW_SUPPORT)
CASE_RETURN_STR(EDR_MAX_POW_SUPPORT)
CASE_RETURN_STR(BLE_MAX_POW_SUPPORT)
- CASE_RETURN_STR(HEARING_AID_SUPPORT)
CASE_RETURN_STR(END_OF_FEATURE_LIST)
}
return "UNKNOWN";
@@ -429,26 +422,6 @@
}
}
break;
- case HEARING_AID_ID:
- {
- switch(feature_name) {
- case HEARING_AID_SUPPORT:
- {
- if (strncasecmp("true",
- db_entry->profile_feature_type.hearing_aid_support_entry.hap_support,
- strlen("true")) == 0)
- feature_set = true;
- LOG_WARN(LOG_TAG, "profile_feature_fetch:HEARING_AID_SUPPORT found = %d" , feature_set);
- }
- break;
- default:
- {
- LOG_WARN(LOG_TAG, "profile_feature_fetch:profile = %d , feature %d not found" ,
- profile, feature_name);
- }
- }
- }
- break;
default:
{
LOG_WARN(LOG_TAG,"%s() profile %d not found",__func__, profile);
@@ -633,32 +606,6 @@
profile_database_add_(entry);
}
break;
- case HEARING_AID_ID:
- {
- LOG_WARN(LOG_TAG, "HEARING_AID_ID: key :: %s, value :: %s",
- key, value);
- entry = profile_entry_fetch(HEARING_AID_ID);
- if (entry == NULL) {
- entry = (profile_db_entry_t *)osi_calloc(sizeof(profile_db_entry_t));
- entry->profile_id = (profile_t)profile_id;
- }
- switch (get_feature(key)) {
- case HEARING_AID_SUPPORT:
- {
- memset(&entry->profile_feature_type.hearing_aid_support_entry.hap_support,
- '\0', VALUE_MAX_LENGTH);
- memcpy(&entry->profile_feature_type.hearing_aid_support_entry.hap_support,
- value, strlen(value));
- }
- break;
- default:
- {
- LOG_WARN(LOG_TAG,"%s is invalid key %s", __func__, key);
- }
- }
- profile_database_add_(entry);
- }
- break;
default:
{
LOG_WARN(LOG_TAG,"%s is invalid profile entry %s", __func__, key);
diff --git a/vhal/include/hardware/vendor.h b/vhal/include/hardware/vendor.h
index 6afb556..ae0f7f1 100644
--- a/vhal/include/hardware/vendor.h
+++ b/vhal/include/hardware/vendor.h
@@ -65,7 +65,6 @@
PBAP_ID,
MAP_ID,
MAX_POW_ID,
- HEARING_AID_ID,
END_OF_PROFILE_LIST
} profile_t;
@@ -81,7 +80,6 @@
BR_MAX_POW_SUPPORT,
EDR_MAX_POW_SUPPORT,
BLE_MAX_POW_SUPPORT,
- HEARING_AID_SUPPORT,
END_OF_FEATURE_LIST
} profile_info_t;