Skip to content

Commit

Permalink
santoni: Use component-override to configure crosshatch Bluetooth
Browse files Browse the repository at this point in the history
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 crosshatch devices.

Remove usages of profile_supported_sap from overlays as they no
longer configure the enable state of .sap.SapService.

Bug: 135048762
Test: adb shell pm query-services \
      com.android.bluetooth/.sap.SapService

Change-Id: I89ba2aa61492f65b269849597282594507d2fdc3
  • Loading branch information
RyanMitch16 authored and bikramdmbd committed Oct 3, 2020
1 parent 9a0915d commit 11ab928
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 25 deletions.
20 changes: 20 additions & 0 deletions component-overrides.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?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=".sap.SapService" enabled="true" />
</component-override>
</config>
4 changes: 4 additions & 0 deletions device.mk
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,10 @@ PRODUCT_PACKAGES += \
antradio_app \
AntHalService

# Bluetooth
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml

# Camera
PRODUCT_PACKAGES += \
camera.msm8937 \
Expand Down
25 changes: 0 additions & 25 deletions overlay/packages/apps/Bluetooth/res/values/config.xml

This file was deleted.

0 comments on commit 11ab928

Please sign in to comment.