From b32c27d074213ad3322d8d1545d210c441dc993b Mon Sep 17 00:00:00 2001 From: Eileen Lai Date: Wed, 20 Nov 2024 09:21:41 +0000 Subject: [PATCH 1/2] modem_svc: remove shared_modem_platform from T6pro Bug: 377799843 Change-Id: I1c9a6e6ed29c6fa428a91e12761cdb028fc345cf Flag: NONE local testing only --- device-tangorpro.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index b1405c2..9670b84 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -104,12 +104,6 @@ PRODUCT_COPY_FILES += \ device/google/tangorpro/thermal_info_config_tangorpro.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ device/google/tangorpro/thermal_info_config_charge_tangorpro.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_charge.json \ -# Shared Modem Platform -SHARED_MODEM_PLATFORM_VENDOR := lassen - -# Shared Modem Platform -include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk - # Power HAL config PRODUCT_COPY_FILES += \ device/google/tangorpro/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json From da4b0d2873c736e95af79399c5e1f5bc0fc67ff6 Mon Sep 17 00:00:00 2001 From: "Liana Kazanova (xWF)" Date: Thu, 21 Nov 2024 17:53:56 +0000 Subject: [PATCH 2/2] Revert "modem_svc: remove shared_modem_platform from T6pro" Revert submission 30519089-move_modem_sepolicy Reason for revert: DroidMonitor: Potential culprit for http://b/380274930 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Reverted changes: /q/submissionid:30519089-move_modem_sepolicy Change-Id: I38b91b63d67d3a72ef688a5f5869bab301ed2853 --- device-tangorpro.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 9670b84..b1405c2 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -104,6 +104,12 @@ PRODUCT_COPY_FILES += \ device/google/tangorpro/thermal_info_config_tangorpro.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ device/google/tangorpro/thermal_info_config_charge_tangorpro.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_charge.json \ +# Shared Modem Platform +SHARED_MODEM_PLATFORM_VENDOR := lassen + +# Shared Modem Platform +include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk + # Power HAL config PRODUCT_COPY_FILES += \ device/google/tangorpro/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json