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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:62e82d5678811a44b2803b1d8c1f132cea148335)
Merged-In: I087a147d6b111c5ea1e89a3ea48961adef733c57
Change-Id: I087a147d6b111c5ea1e89a3ea48961adef733c57
This commit is contained in:
Kah Xuan Lim 2024-07-02 06:13:40 +00:00 committed by Android Build Coastguard Worker
parent 8d565119fd
commit c705d6b694
2 changed files with 13 additions and 15 deletions

View file

@ -228,21 +228,18 @@ $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHA
# modem_ml_svc_sit daemon # modem_ml_svc_sit daemon
PRODUCT_PACKAGES += modem_ml_svc_sit PRODUCT_PACKAGES += modem_ml_svc_sit
ifeq (,$(filter aosp_%,$(TARGET_PRODUCT))) # TODO: b/350624523 - Add back modem ML TFLite service after it is ready.
# Modem ML TFLite service. # ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
PRODUCT_PACKAGES += modemml-tflite-service \ # # Modem ML TFLite service.
libtensorflowlite_jni # PRODUCT_PACKAGES += modemml-tflite-service \
# libtensorflowlite_jni
# Allow TFLite service modules to be installed to the system partition # # Allow TFLite service modules to be installed to the system partition
PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ # PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
system/etc/vintf/manifest/modemml_tflite_service.xml \ # system/lib64/libtensorflowlite_jni.so
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
PRODUCT_SYSTEM_SERVER_JARS += modemml-tflite-service # PRODUCT_SYSTEM_SERVER_JARS += system_ext:modemml-tflite-service
endif # endif
# modem ML models configs # modem ML models configs
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))

View file

@ -304,9 +304,10 @@
<!-- Class names of device-specific services inheriting com.android.server.SystemService. The <!-- Class names of device-specific services inheriting com.android.server.SystemService. The
classes are instantiated in the order of the array. --> 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> <item>com.android.server.modemml.TFLiteService</item>
</string-array> </string-array> -->
<!-- Pre-scale volume at volume step 1 for Absolute Volume --> <!-- Pre-scale volume at volume step 1 for Absolute Volume -->
<fraction name="config_prescaleAbsoluteVolume_index1">100%</fraction> <fraction name="config_prescaleAbsoluteVolume_index1">100%</fraction>