lisa/android_device_xiaomi_sm8350-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sm6250-common: Use component-override to configure Bluetooth

Browse Source 
Runtime Resource Overlays (RROs) can no longer change the value of
resources in manifest when read during PackagerParser.

This change uses component-override to enable the service by default
on sunfish devices.

Remove usages of profile_supported_* from overlays as they no
longer configure the enable state of Bluetooth componenets.

Bug: 135048762
Test:
      adb shell pm query-services \
      com.android.bluetooth/.a2dpsink.A2dpSinkService
      adb shell pm query-services \
      com.android.bluetooth/.avrcp.AvrcpTargetService
      adb shell pm query-services \
      com.android.bluetooth/.avrcpcontroller.AvrcpControllerService
      adb shell pm query-services \
      com.android.bluetooth/.ba.BATService
      adb shell pm query-services \
      com.android.bluetooth/.hfpclient.HeadsetClientService
      adb shell pm query-services \
      com.android.bluetooth/.hid.HidDeviceService
      adb shell pm query-services \
      com.android.bluetooth/.sap.SapService

Change-Id: If41df9fdefbcd952f8387451dc137565343e3d75
This commit is contained in:
Ryan Mitchell 2019-10-10 10:21:46 -07:00 committed by Demon000
parent 98c9d2a95b
commit a6db72a1fc
4 changed files with 29 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common.mk
View File

@ -67,6 +67,10 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \
frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml
# Component override
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml
# FM
PRODUCT_PACKAGES += \
FM2 \
@ -261,14 +265,12 @@ PRODUCT_COPY_FILES += \
# Overlays
DEVICE_PACKAGE_OVERLAYS += \
$(LOCAL_PATH)/overlay \
$(LOCAL_PATH)/overlay-lineage \
$(LOCAL_PATH)/overlay-system
$(LOCAL_PATH)/overlay-lineage
PRODUCT_ENFORCE_RRO_TARGETS := *
PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += \
$(LOCAL_PATH)/overlay-lineage/lineage-sdk \
$(LOCAL_PATH)/overlay-lineage/packages/apps/Snap \
$(LOCAL_PATH)/overlay-system
$(LOCAL_PATH)/overlay-lineage/packages/apps/Snap
# Partitions
PRODUCT_USE_DYNAMIC_PARTITIONS := true

23
configs/component-overrides.xml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<config>
<component-override package="com.android.bluetooth" >
<component class=".a2dpsink.A2dpSinkService" enabled="true" />
<component class=".avrcp.AvrcpTargetService" enabled="false" />
<component class=".avrcpcontroller.AvrcpControllerService" enabled="true" />
<component class=".ba.BATService" enabled="true" />
<component class=".hfpclient.HeadsetClientService" enabled="false" />
<component class=".hid.HidDeviceService" enabled="false" />
<component class=".sap.SapService" enabled="false" />
</component-override>
</config>

21
overlay-system/vendor/qcom/opensource/commonsys/packages/apps/Bluetooth/res/values/config.xml vendored
View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<bool name="profile_supported_avrcp_controller">true</bool>
<bool name="profile_supported_ba">true</bool>
<bool name="profile_supported_hfpclient">false</bool>
<bool name="profile_supported_hid_device">false</bool>
<bool name="profile_supported_sap">false</bool>
</resources>

18
overlay/vendor/qcom/opensource/commonsys/packages/apps/Bluetooth/res/values/config.xml vendored
View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<bool name="profile_supported_a2dp_sink">true</bool>
<bool name="profile_supported_avrcp_target">false</bool>
</resources>