summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-05-10 16:05:24 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-05-10 16:05:24 +0000
commit11870b65a809be6d73f104927891180b7a1af39e (patch)
tree9e7f0da948efd84e0a92dd04802fb311768ae50d
parentdbd3744f3edcb60a4ae520167971d8641250e192 (diff)
parent107a77e686e689bc71756af611e81318bdfb5793 (diff)
downloadbramble-11870b65a809be6d73f104927891180b7a1af39e.tar.gz
Snap for 10103804 from 107a77e686e689bc71756af611e81318bdfb5793 to mainline-tzdata5-release
Change-Id: I815a941a6e29def317927f5bcfb36b10d7fd9a66
-rw-r--r--bramble/init.bramble.rc1
-rw-r--r--bramble/overlay/packages/apps/Nfc/res/values/config.xml10
-rw-r--r--device-bramble.mk3
3 files changed, 13 insertions, 1 deletions
diff --git a/bramble/init.bramble.rc b/bramble/init.bramble.rc
index 641f428..2d30f05 100644
--- a/bramble/init.bramble.rc
+++ b/bramble/init.bramble.rc
@@ -38,6 +38,7 @@ on property:debug.touch_sensitivity_mode=1
service vendor.mdm_helper /vendor/bin/mdm_helper
class core
group system wakelock
+ user root
on late-init
chown system system /sys/devices/virtual/thermal/tz-by-name/skin-therm-monitor/trip_point_0_temp
diff --git a/bramble/overlay/packages/apps/Nfc/res/values/config.xml b/bramble/overlay/packages/apps/Nfc/res/values/config.xml
index 5d9ebd7..fe16e58 100644
--- a/bramble/overlay/packages/apps/Nfc/res/values/config.xml
+++ b/bramble/overlay/packages/apps/Nfc/res/values/config.xml
@@ -25,4 +25,14 @@
<item>G6QU3</item>
</string-array>
<bool name="tag_intent_app_pref_supported">true</bool>
+ <!-- NFC Antenna Location API -->
+ <integer name="device_width">70</integer>
+ <integer name="device_height">150</integer>
+ <bool name="device_foldable">false</bool>
+ <integer-array name="antenna_x">
+ <item>39</item>
+ </integer-array>
+ <integer-array name="antenna_y">
+ <item>87</item>
+ </integer-array>
</resources>
diff --git a/device-bramble.mk b/device-bramble.mk
index 8d74f1e..bbf0368 100644
--- a/device-bramble.mk
+++ b/device-bramble.mk
@@ -36,7 +36,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/compression_wit
LOCAL_PATH := device/google/bramble
PRODUCT_SOONG_NAMESPACES += \
- device/google/bramble
+ device/google/bramble \
+ hardware/qcom/wlan/legacy
DEVICE_PACKAGE_OVERLAYS += device/google/bramble/bramble/overlay