From c705d6b6944497be5457526fac3c6e7c8d77b4af Mon Sep 17 00:00:00 2001 From: Kah Xuan Lim Date: Tue, 2 Jul 2024 06:13:40 +0000 Subject: [PATCH] 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 --- 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 dc800c7..d0097dc 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 1ed30fa..f6b7439 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 @@ - + + 100%