From eabb3bff48578ddaa1add5f8b127131a1a7d2428 Mon Sep 17 00:00:00 2001 From: Mars Lin Date: Wed, 8 Jun 2022 22:11:37 +0800 Subject: [PATCH 1/2] raviole: Move tetheroffload HAL to raviole Since T6 does not support tetheroffload, move the tetheroffload HAL to raviole. Bug: 232717674 Test: Check if the manifest file exist in vendor/etc/vintf/manifest/ Change-Id: I0f8eb470bc54da942dc8d5ddd543b7c573613567 --- device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ device-slider.mk | 4 ++++ device-whitefin.mk | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 84386ab..6c6e738 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -211,6 +211,10 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PACKAGES += \ bt_vendor.conf +# tetheroffload HAL +PRODUCT_PACKAGES += \ + vendor.samsung_slsi.hardware.tetheroffload@1.1-service + # Override default distortion output gain according to UX experiments PRODUCT_PRODUCT_PROPERTIES += \ vendor.audio.hapticgenerator.distortion.output.gain=0.5 diff --git a/device-raven.mk b/device-raven.mk index ac526ed..72a42a5 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -228,6 +228,10 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PACKAGES += \ bt_vendor.conf +# tetheroffload HAL +PRODUCT_PACKAGES += \ + vendor.samsung_slsi.hardware.tetheroffload@1.1-service + # Override default distortion output gain according to UX experiments PRODUCT_PRODUCT_PROPERTIES += \ vendor.audio.hapticgenerator.distortion.output.gain=0.5 diff --git a/device-slider.mk b/device-slider.mk index 647ee73..bba1e52 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -110,6 +110,10 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts PRODUCT_PACKAGES += \ bt_vendor.conf +# tetheroffload HAL +PRODUCT_PACKAGES += \ + vendor.samsung_slsi.hardware.tetheroffload@1.1-service + # Power HAL config PRODUCT_COPY_FILES += \ device/google/raviole/powerhint-slider.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json diff --git a/device-whitefin.mk b/device-whitefin.mk index 577092e..6378046 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -91,6 +91,10 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts PRODUCT_PACKAGES += \ bt_vendor.conf +# tetheroffload HAL +PRODUCT_PACKAGES += \ + vendor.samsung_slsi.hardware.tetheroffload@1.1-service + # Power HAL config PRODUCT_COPY_FILES += \ device/google/raviole/powerhint-whitefin.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json From aa95ad8897967373e3129e40ce76aada5f0d2d12 Mon Sep 17 00:00:00 2001 From: Zac Iqbal Date: Thu, 9 Jun 2022 18:55:40 +0000 Subject: [PATCH 2/2] Revert "DO NOT MERGE Remove unintended faceauth configs am: a020..." Revert "DO NOT MERGE Remove unintended face config am: 875235afbf" Revert submission 18799414-am-e98f52416a40436ba0044e72d6feed21 Reason for revert: The merge path was only meant for tm-dev. Reverted Changes: I6ace51cab:DO NOT MERGE Remove faceauth from raven am: 783e56... I049a9c205:DO NOT MERGE Remove unintended face config am: 875... I50ae185c6:DO NOT MERGE Remove unintended faceauth configs am... Change-Id: I26f6409b50769dac5509313a32517cb270edc779 --- conf/init.raven.rc | 4 ++++ raven/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/conf/init.raven.rc b/conf/init.raven.rc index 4d35ee1..5153c58 100644 --- a/conf/init.raven.rc +++ b/conf/init.raven.rc @@ -11,6 +11,10 @@ on init # Power Stats HAL chown system system /sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats +on fs + # Face + exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app + on property:vendor.mfgapi.touchpanel.permission=1 chmod 0600 /sys/devices/virtual/sec/tsp/cmd chown system system /sys/devices/virtual/sec/tsp/cmd diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 6fd22bc..e945ffd 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -202,6 +202,9 @@ 130px 28dp + + false + 64