diff options
| -rw-r--r-- | configs/component-overrides-qti.xml | 21 | ||||
| -rw-r--r-- | configs/component-overrides.xml | 23 | ||||
| -rw-r--r-- | overlay-system/vendor/qcom/opensource/commonsys/packages/apps/Bluetooth/res/values/config.xml | 35 | ||||
| -rw-r--r-- | overlay/vendor/qcom/opensource/commonsys/packages/apps/Bluetooth/res/values/config.xml | 37 | ||||
| -rw-r--r-- | sdm660.mk | 10 |
5 files changed, 50 insertions, 76 deletions
diff --git a/configs/component-overrides-qti.xml b/configs/component-overrides-qti.xml new file mode 100644 index 0000000..4e257b0 --- /dev/null +++ b/configs/component-overrides-qti.xml @@ -0,0 +1,21 @@ +<?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-override> +</config> diff --git a/configs/component-overrides.xml b/configs/component-overrides.xml new file mode 100644 index 0000000..a4fd25e --- /dev/null +++ b/configs/component-overrides.xml @@ -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=".avrcpcontroller.AvrcpControllerService" enabled="true" /> + <component class=".ba.BATService" enabled="true" /> + <component class=".hid.HidDeviceService" enabled="false" /> + <component class=".sap.SapService" enabled="true" /> + </component-override> +</config> diff --git a/overlay-system/vendor/qcom/opensource/commonsys/packages/apps/Bluetooth/res/values/config.xml b/overlay-system/vendor/qcom/opensource/commonsys/packages/apps/Bluetooth/res/values/config.xml deleted file mode 100644 index 027ac61..0000000 --- a/overlay-system/vendor/qcom/opensource/commonsys/packages/apps/Bluetooth/res/values/config.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted (subject to the limitations in the - disclaimer below) provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of the Linux Foundation nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE - GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT - HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---> -<resources> - <bool name="profile_supported_a2dp_sink">true</bool> - <bool name="profile_supported_avrcp_target">false</bool> -</resources> diff --git a/overlay/vendor/qcom/opensource/commonsys/packages/apps/Bluetooth/res/values/config.xml b/overlay/vendor/qcom/opensource/commonsys/packages/apps/Bluetooth/res/values/config.xml deleted file mode 100644 index 68b18d8..0000000 --- a/overlay/vendor/qcom/opensource/commonsys/packages/apps/Bluetooth/res/values/config.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted (subject to the limitations in the - disclaimer below) provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of the Linux Foundation nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE - GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT - HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---> -<resources> - <bool name="profile_supported_avrcp_controller">true</bool> - <bool name="profile_supported_sap">true</bool> - <bool name="profile_supported_hid_device">false</bool> - <bool name="profile_supported_ba">true</bool> -</resources> @@ -28,12 +28,9 @@ PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true # 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-system # Soong namespaces PRODUCT_SOONG_NAMESPACES += \ @@ -189,6 +186,11 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.consumerir.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.consumerir.xml +# Component overrides +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/configs/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \ + $(LOCAL_PATH)/configs/component-overrides-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/component-overrides.xml + # Display PRODUCT_PACKAGES += \ gralloc.sdm660 \ |