From e85039c0b90c60263c81b8f6a06ef38a1771d227 Mon Sep 17 00:00:00 2001
From: roynatech2544 <whiteshell2544@naver.com>
Date: Thu, 25 Nov 2021 13:32:18 +0900
Subject: [PATCH] universal7885: bluetooth: HAL uprev to 1.1

* Additionally, more force enables

Signed-off-by: roynatech2544 <whiteshell2544@naver.com>
---
 ...onent-overrides.xml => component-overrides-bluetooth.xml} | 3 ++-
 universal7885-common/configs/vintf/manifest.xml              | 2 +-
 universal7885-common/universal7885-common.mk                 | 5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename universal7885-common/configs/permissions/{component-overrides.xml => component-overrides-bluetooth.xml} (88%)

diff --git a/universal7885-common/configs/permissions/component-overrides.xml b/universal7885-common/configs/permissions/component-overrides-bluetooth.xml
similarity index 88%
rename from universal7885-common/configs/permissions/component-overrides.xml
rename to universal7885-common/configs/permissions/component-overrides-bluetooth.xml
index e3180b0..9ce4646 100644
--- a/universal7885-common/configs/permissions/component-overrides.xml
+++ b/universal7885-common/configs/permissions/component-overrides-bluetooth.xml
@@ -19,7 +19,8 @@
         <component class=".avrcpcontroller.AvrcpControllerService" enabled="true" />
         <component class=".avrcpcontroller.BluetoothMediaBrowserService" enabled="true" />
         <component class=".hfpclient.connserv.HeadsetClientService" enabled="true" />
-        <component class=".hfpclient.HeadsetClientService" enabled="true" />
+	<component class=".hfpclient.HeadsetClientService" enabled="true" />
+	<component class=".hfpclient.connserv.HfpClientConnectionService" enabled="true" />
         <component class=".sap.SapService" enabled="true" />
     </component-override>
 </config>
diff --git a/universal7885-common/configs/vintf/manifest.xml b/universal7885-common/configs/vintf/manifest.xml
index a4ccec4..160d033 100644
--- a/universal7885-common/configs/vintf/manifest.xml
+++ b/universal7885-common/configs/vintf/manifest.xml
@@ -48,7 +48,7 @@
     <hal format="hidl">
         <name>android.hardware.bluetooth</name>
         <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1.1</version>
         <interface>
             <name>IBluetoothHci</name>
             <instance>default</instance>
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index fde091f..b3b95ec 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -56,8 +56,7 @@ PRODUCT_COPY_FILES += \
 
 # Bluetooth
 PRODUCT_PACKAGES += \
-    android.hardware.bluetooth@1.0-impl \
-    android.hardware.bluetooth@1.0-service \
+    android.hardware.bluetooth@1.1-service \
     audio.a2dp.default \
     libbt-vendor
 
@@ -76,7 +75,7 @@ PRODUCT_PACKAGES += \
 
 # Component overrides
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/permissions/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml
+    $(LOCAL_PATH)/configs/permissions/component-overrides-bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides-bluetooth.xml
 
 # DRM
 PRODUCT_PACKAGES += \