commit 8cedd314b6d18bce6feaf50aaef20906968fb15e
author Sumit Deshmukh <sumitd@codeaurora.org> Thu Dec 19 20:30:48 2019 +0530
committer Sumit Deshmukh <sumitd@codeaurora.org> Fri Dec 20 09:50:53 2019 +0000
tree 32184dc1c3a199bceade8409545e92b3c6a89bf1
parent 67133f910cfb9d8f379ac77a91567f399ad28693

Hearing Aid: Use consistent profile support value in framework and app

- This change uses same value for enabling profile support which
  is maintained at frameworks.
- Method to enable Hearing Aid Profile from bt_profile.conf is removed
- Profile feature indexes to be fetched from bt_profile.conf file
  are corrected to have same values across apps and stack.

Change-Id: I649dd80a85dcef97c44fd2e8a65d56794ce9f17e
CRs-Fixed: 2590574

src/com/android/bluetooth/btservice/AbstractionLayer.java

diff --git a/src/com/android/bluetooth/btservice/AbstractionLayer.java b/src/com/android/bluetooth/btservice/AbstractionLayer.java
index 30493f1..3da2440 100644
--- a/src/com/android/bluetooth/btservice/AbstractionLayer.java
+++ b/src/com/android/bluetooth/btservice/AbstractionLayer.java
@@ -126,7 +126,6 @@
     public static final int PBAP = 2;
     public static final int MAP = 3;
     public static final int MAX_POW = 4;
-    public static final int HEARING_AID = 5;
 
     // Profile features supported in profile_conf
     public static final int PROFILE_VERSION =1;
@@ -139,7 +138,6 @@
     public static final int BR_MAX_POW_SUPPORT = 8;
     public static final int EDR_MAX_POW_SUPPORT = 9;
     public static final int BLE_MAX_POW_SUPPORT = 10;
-    public static final int HEARING_AID_SUPPORT = 11;
 
 
     static final int BT_VENDOR_PROPERTY_TWS_PLUS_DEVICE_TYPE = 0x01;

src/com/android/bluetooth/btservice/Config.java

diff --git a/src/com/android/bluetooth/btservice/Config.java b/src/com/android/bluetooth/btservice/Config.java
index 0a91e55..0e170b1 100644
--- a/src/com/android/bluetooth/btservice/Config.java
+++ b/src/com/android/bluetooth/btservice/Config.java
@@ -121,12 +121,10 @@
         for (ProfileConfig config : PROFILE_SERVICES_AND_FLAGS) {
             boolean supported = resources.getBoolean(config.mSupported);
 
-            if (config.mClass == HearingAidService.class &&
-                    FeatureFlagUtils.isEnabled(ctx, FeatureFlagUtils.HEARING_AID_SETTINGS)) {
-                if (!isHearingAidSupported()) {
-                    supported = false;
-                }
-                if (supported) Log.v(TAG, "HearingAidService is enabled");
+            if (!supported && (config.mClass == HearingAidService.class) && FeatureFlagUtils
+                                .isEnabled(ctx, FeatureFlagUtils.HEARING_AID_SETTINGS)) {
+                Log.v(TAG, "Feature Flag enables support for HearingAidService");
+                supported = true;
             }
 
             if (supported && !isProfileDisabled(ctx, config.mMask)) {
@@ -203,15 +201,4 @@
         // always return true for other profiles
         return true;
     }
-
-    private static boolean isHearingAidSupported() {
-        AdapterService adapterService = AdapterService.getAdapterService();
-        boolean isHearingAidSupported = false;
-        if (adapterService != null) {
-          isHearingAidSupported = adapterService.getProfileInfo(
-              AbstractionLayer.HEARING_AID, AbstractionLayer.HEARING_AID_SUPPORT);
-          Log.d(TAG, "isHearingAidSupported: " + isHearingAidSupported);
-        }
-        return isHearingAidSupported;
-    }
 }