From d242564abdc69e6adb3136c40b10a1a710ee1a6d Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Wed, 18 Aug 2021 12:35:36 +0800 Subject: [PATCH] reuse gs101 pktrouter Bug: 196916111 Test: boot with pktrouter launched Change-Id: I10bdeccd32db50152993b64bb4b7ee2e303da017 --- conf/init.gs201.rc | 13 ------------- device.mk | 3 +-- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 5df4666a..227dbfd4 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -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 diff --git a/device.mk b/device.mk index 726fa4a9..adcaca74 100644 --- a/device.mk +++ b/device.mk @@ -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