Merge "reuse gs101 pktrouter"

This commit is contained in:
Adam Shih 2021-08-23 06:40:06 +00:00 committed by Android (Google) Code Review
commit 00a3bf0a8b
2 changed files with 1 additions and 15 deletions

View file

@ -664,19 +664,6 @@ on property:vendor.charon.exec=0
stop charonservice
rm /data/vendor/misc/vpn/charon.pid
# IMS packet router daemon
service pktrouter /system/vendor/bin/wfc-pkt-router
class main
user root
disabled
seclabel u:r:pktrouter:s0
on property:vendor.pktrouter=1
start pktrouter
on property:vendor.pktrouter=0
stop pktrouter
# charger driver exposes now finer grain control, map demo mode to those properties
# NOTE: demo mode can only be exit wiping data (which reset the persist properties)
on property:sys.retaildemo.enabled=1

View file

@ -853,7 +853,6 @@ $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/shannon-ims/devi
PRODUCT_PACKAGES += ShannonIms
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/shannon-iwlan/device-vendor.mk)
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/packetrouter/device-vendor.mk)
#RCS Test Messaging App
PRODUCT_PACKAGES_DEBUG += \
@ -1049,7 +1048,7 @@ PRODUCT_PACKAGES += \
libgc2_utils
## Start packet router
#PRODUCT_PROPERTY_OVERRIDES += vendor.pktrouter=1
include device/google/gs101/telephony/pktrouter.mk
# Thermal HAL
include hardware/google/pixel/thermal/device.mk