From 0eea03d28ac3c55c57fbe1dedc959922a37b0dcb Mon Sep 17 00:00:00 2001 From: Sal Savage Date: Wed, 27 Apr 2022 13:29:57 -0700 Subject: [PATCH] Use the ?= operator so BT properties can be overridden System properties set with the "=" operator cannot be overriden. This device is used elsewhere in the system and some of the properties need to be overridden. The "?=" operator will use the assigned value if no other values are assigned elsewhere, allowing for overrides. Bug: 230638462 Test: adb shell getprop | grep bluetooth Merged-In: I45b1786f5556ba3e7d493ea17dc955cd317a1156 Change-Id: I45b1786f5556ba3e7d493ea17dc955cd317a1156 --- device.mk | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/device.mk b/device.mk index dc24a0ed..45efdc2e 100644 --- a/device.mk +++ b/device.mk @@ -115,27 +115,27 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Set supported Bluetooth profiles to enabled PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.profile.asha.central.enabled=true \ - bluetooth.profile.a2dp.source.enabled=true \ - bluetooth.profile.avrcp.target.enabled=true \ - bluetooth.profile.bap.broadcast.assist.enabled=true \ - bluetooth.profile.bap.unicast.client.enabled=true \ - bluetooth.profile.bas.client.enabled=true \ - bluetooth.profile.csip.set_coordinator.enabled=true \ - bluetooth.profile.gatt.enabled=true \ - bluetooth.profile.hap.client.enabled=true \ - bluetooth.profile.hfp.ag.enabled=true \ - bluetooth.profile.hid.device.enabled=true \ - bluetooth.profile.hid.host.enabled=true \ - bluetooth.profile.map.server.enabled=true \ - bluetooth.profile.mcp.server.enabled=true \ - bluetooth.profile.opp.enabled=true \ - bluetooth.profile.pan.nap.enabled=true \ - bluetooth.profile.pan.panu.enabled=true \ - bluetooth.profile.pbap.server.enabled=true \ - bluetooth.profile.sap.server.enabled=true \ - bluetooth.profile.ccp.server.enabled=true \ - bluetooth.profile.vcp.controller.enabled=true + bluetooth.profile.asha.central.enabled?=true \ + bluetooth.profile.a2dp.source.enabled?=true \ + bluetooth.profile.avrcp.target.enabled?=true \ + bluetooth.profile.bap.broadcast.assist.enabled?=true \ + bluetooth.profile.bap.unicast.client.enabled?=true \ + bluetooth.profile.bas.client.enabled?=true \ + bluetooth.profile.csip.set_coordinator.enabled?=true \ + bluetooth.profile.gatt.enabled?=true \ + bluetooth.profile.hap.client.enabled?=true \ + bluetooth.profile.hfp.ag.enabled?=true \ + bluetooth.profile.hid.device.enabled?=true \ + bluetooth.profile.hid.host.enabled?=true \ + bluetooth.profile.map.server.enabled?=true \ + bluetooth.profile.mcp.server.enabled?=true \ + bluetooth.profile.opp.enabled?=true \ + bluetooth.profile.pan.nap.enabled?=true \ + bluetooth.profile.pan.panu.enabled?=true \ + bluetooth.profile.pbap.server.enabled?=true \ + bluetooth.profile.sap.server.enabled?=true \ + bluetooth.profile.ccp.server.enabled?=true \ + bluetooth.profile.vcp.controller.enabled?=true PRODUCT_PROPERTY_OVERRIDES += \ telephony.active_modems.max_count=2