sdm660-common: Use component-override to configure Bluetooth
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. Remove usages of profile_supported_* from overlays as they no longer configure the enable state of Bluetooth components. Bug: 135048762 Test: adb shell pm query-services \ com.android.bluetooth/.avrcpcontroller.AvrcpControllerService adb shell pm query-services \ com.android.bluetooth/.hid.HidDeviceService adb shell pm query-services \ com.android.bluetooth/.sap.SapService Change-Id: I284d254a921b14d1533745611a083f4b5a27d9dc
This commit is contained in:
parent
256c2fbfed
commit
1e203fcfbe
3 changed files with 26 additions and 37 deletions
22
configs/component-overrides.xml
Normal file
22
configs/component-overrides.xml
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
<?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=".hid.HidDeviceService" enabled="false" />
|
||||||
|
<component class=".sap.SapService" enabled="true" />
|
||||||
|
</component-override>
|
||||||
|
</config>
|
|
@ -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_hid_device">false</bool>
|
|
||||||
<bool name="profile_supported_sap">true</bool>
|
|
||||||
</resources>
|
|
|
@ -173,6 +173,10 @@ PRODUCT_PACKAGES += \
|
||||||
com.android.media.swcodec \
|
com.android.media.swcodec \
|
||||||
libsfplugin_ccodec
|
libsfplugin_ccodec
|
||||||
|
|
||||||
|
# Component overrides
|
||||||
|
PRODUCT_COPY_FILES += \
|
||||||
|
$(LOCAL_PATH)/configs/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml
|
||||||
|
|
||||||
# Connectivity Engine support (CNE)
|
# Connectivity Engine support (CNE)
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
cneapiclient \
|
cneapiclient \
|
||||||
|
|
Loading…
Reference in a new issue