From 9aa4809cf3fd5345f54ee3191d0441eac4c267aa Mon Sep 17 00:00:00 2001
From: liangjlee <liangjlee@google.com>
Date: Thu, 27 Jun 2024 02:03:46 +0800
Subject: [PATCH 1/3] zumapro: Include power/power.mk

Bug: 331612600
Flag: EXEMPT (bug 337358613)
Change-Id: I219168dd67835647fc4fc0a2f35484b634b94b8f
Signed-off-by: liangjlee <liangjlee@google.com>
---
 device.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device.mk b/device.mk
index 7fe294e..a1180de 100644
--- a/device.mk
+++ b/device.mk
@@ -26,6 +26,7 @@ include device/google/gs-common/storage/storage.mk
 include device/google/gs-common/thermal/dump/thermal.mk
 include device/google/gs-common/thermal/thermal_hal/device.mk
 include device/google/gs-common/performance/perf.mk
+include device/google/gs-common/power/power.mk
 include device/google/gs-common/pixel_metrics/pixel_metrics.mk
 include device/google/gs-common/soc/freq.mk
 include device/google/gs-common/gps/dump/log.mk

From f6f6d414126f1138ccefd8a4a420db422d056836 Mon Sep 17 00:00:00 2001
From: Hyosun Kim <hyosunkim@google.com>
Date: Thu, 27 Jun 2024 12:55:35 +0000
Subject: [PATCH 2/3] Supports Android APIs for the Carrier NB-Satellite
 Provisioning

add device config

Bug: 348573493
Test: atest SatelliteManagerTest, SatelliteManagerTestOnMockService
Flag: com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn

Change-Id: Id8c7699aae94c53a8c0b62fb6259f7b2fb94c731
---
 overlay/frameworks/base/core/res/res/values/config.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 1ed30fa..661130b 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -517,4 +517,10 @@
 
     <!-- The intent action to handle oem-enabled satellite SOS messaging. -->
     <string name="config_satellite_emergency_handover_intent_action">com.google.android.apps.stargate.ACTION_ESOS_QUESTIONNAIRE</string>
+
+    <!-- The class name to handle carrier roaming to satellite is using ESOS messaging. -->
+    <string name="config_satellite_carrier_roaming_esos_provisioned_class">com.google.android.apps.stargate</string>
+
+    <!-- The intent action to handle carrier roaming to satellite is using ESOS messaging. -->
+    <string name="config_satellite_carrier_roaming_esos_provisioned_intent_action">com.google.satellitegateway.ACTION_REGISTER</string>
 </resources>

From 62e82d5678811a44b2803b1d8c1f132cea148335 Mon Sep 17 00:00:00 2001
From: Kah Xuan Lim <kahxuan@google.com>
Date: Tue, 2 Jul 2024 06:13:40 +0000
Subject: [PATCH 3/3] Disable modemml-tflite-service

The service is causing CTS test failure as it has Kotlin files which are not allowed for system services. It's safe to disable the service temporarily as we don't have any user depending on it for now.

Bug: 349263931
Test: Manually flashed device with go/ab/P76995945, no errors observed
Flag: EXEMPT bugfix
Change-Id: I087a147d6b111c5ea1e89a3ea48961adef733c57
---
 device.mk                                     | 23 ++++++++-----------
 .../base/core/res/res/values/config.xml       |  5 ++--
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/device.mk b/device.mk
index 6eec466..ab399d3 100644
--- a/device.mk
+++ b/device.mk
@@ -228,21 +228,18 @@ $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHA
 # modem_ml_svc_sit daemon
 PRODUCT_PACKAGES += modem_ml_svc_sit
 
-ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
-# Modem ML TFLite service.
-PRODUCT_PACKAGES += modemml-tflite-service \
-	libtensorflowlite_jni
+# TODO: b/350624523 - Add back modem ML TFLite service after it is ready.
+# ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
+# # Modem ML TFLite service.
+# PRODUCT_PACKAGES += modemml-tflite-service \
+# 	libtensorflowlite_jni
 
-# Allow TFLite service modules to be installed to the system partition
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
-	system/etc/vintf/manifest/modemml_tflite_service.xml \
-	system/framework/modemml-tflite-service.jar \
-	system/framework/oat/arm64/modemml-tflite-service.odex \
-	system/framework/oat/arm64/modemml-tflite-service.vdex \
-	system/lib64/libtensorflowlite_jni.so
+# # Allow TFLite service modules to be installed to the system partition
+# PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
+# 	system/lib64/libtensorflowlite_jni.so
 
-PRODUCT_SYSTEM_SERVER_JARS += modemml-tflite-service
-endif
+# PRODUCT_SYSTEM_SERVER_JARS += system_ext:modemml-tflite-service
+# endif
 
 # modem ML models configs
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 661130b..a752fd1 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -304,9 +304,10 @@
 
     <!-- Class names of device-specific services inheriting com.android.server.SystemService. The
          classes are instantiated in the order of the array. -->
-    <string-array translatable="false" name="config_deviceSpecificSystemServices">
+    <!-- TODO: b/350624523 - Add back modem ML TFLite service after it is ready. -->
+    <!-- <string-array translatable="false" name="config_deviceSpecificSystemServices">
         <item>com.android.server.modemml.TFLiteService</item>
-    </string-array>
+    </string-array> -->
 
     <!-- Pre-scale volume at volume step 1 for Absolute Volume -->
     <fraction name="config_prescaleAbsoluteVolume_index1">100%</fraction>