From 015c1986eea3f15c27c46c6499f7228aa5881d74 Mon Sep 17 00:00:00 2001 From: Shashwat Razdan Date: Tue, 5 Mar 2024 23:50:00 -0800 Subject: [PATCH 01/23] Adding android.software.contextualsearch to zumapro devices. Bug: 326143814 Test: Built and tested on device (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8122febec5ab0d1d761eacabc2796d77abba0e3a) Merged-In: Idfa95159b310800819742c3e265cf7301138a9cb Change-Id: Idfa95159b310800819742c3e265cf7301138a9cb --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 28e7c1e..a8a35a3 100644 --- a/device.mk +++ b/device.mk @@ -293,6 +293,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.vulkan.version-1_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \ frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \ frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \ + frameworks/native/data/etc/android.software.contextualsearch.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.contextualsearch.xml \ frameworks/native/data/etc/android.software.vulkan.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ frameworks/native/data/etc/android.software.opengles.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml From bfcc4709a3821fe94b6f0486c728e3a1e966f269 Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Tue, 5 Mar 2024 00:55:40 +0000 Subject: [PATCH 02/23] Revert "Add betterbug mk to zumapro" Revert submission 26348985-bb-sepolicy-poc Reason for revert: Droidfood blocking bug: b/327991669 Reverted changes: /q/submissionid:26348985-bb-sepolicy-poc (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8d27b29ae1c4603700a7b2a2891438a1f2e1ba9d) Merged-In: I77595ebfa5c9bb7b8673dd132e7021fb0ed7e7ad Change-Id: I77595ebfa5c9bb7b8673dd132e7021fb0ed7e7ad --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index a8a35a3..90d0470 100644 --- a/device.mk +++ b/device.mk @@ -41,7 +41,6 @@ include device/google/gs-common/sota_app/factoryota.mk include device/google/gs-common/misc_writer/misc_writer.mk include device/google/gs-common/gyotaku_app/gyotaku.mk include device/google/gs-common/bootctrl/bootctrl_aidl.mk -include device/google/gs-common/betterbug/betterbug.mk include device/google/zumapro/dumpstate/item.mk From 0e5cd769fe31ee00a4e366502f1c35d048c3c17e Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Sat, 17 Feb 2024 12:33:52 +0800 Subject: [PATCH 03/23] gps: maintain one solution Bug: 315915958 Test: build pass and GPS function works Change-Id: I873fca68597188ccca7cd83e6665da5f047068aa --- conf/init.zumapro.board.rc | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 2dc0b16..31c34ce 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -294,26 +294,6 @@ on post-fs-data # Video data mkdir /data/vendor/media 0700 mediacodec mediacodec -on post-fs-data - # GPS - mkdir /data/vendor/gps 0771 system system - chown system system /data/vendor/gps - rm /data/vendor/gps/gps_started - rm /data/vendor/gps/glonass_started - rm /data/vendor/gps/beidou_started - rm /data/vendor/gps/smd_started - rm /data/vendor/gps/sv_cno.info - - chown gps system /sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby - chmod 0664 /dev/ttyBCM - chown gps system /dev/ttyBCM - chmod 0664 /dev/bbd_control - chown gps system /dev/bbd_control - chmod 0664 /dev/bbd_patch - chown gps system /dev/bbd_patch - chmod 0664 /dev/bbd_sensor - chown gps system /dev/bbd_sensor - on early-boot # Wait for insmod_sh to finish all common modules wait_for_prop vendor.common.modules.ready 1 From 6519a1598bd25f9b5e2b9f9900986fe96cee65aa Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Sat, 17 Feb 2024 12:33:52 +0800 Subject: [PATCH 04/23] gps: maintain one solution Bug: 315915958 Test: build pass and GPS function works Change-Id: I873fca68597188ccca7cd83e6665da5f047068aa Merged-In: I873fca68597188ccca7cd83e6665da5f047068aa --- conf/init.zumapro.board.rc | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 2279e47..741f011 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -300,26 +300,6 @@ on post-fs-data # Video data mkdir /data/vendor/media 0700 mediacodec mediacodec -on post-fs-data - # GPS - mkdir /data/vendor/gps 0771 system system - chown system system /data/vendor/gps - rm /data/vendor/gps/gps_started - rm /data/vendor/gps/glonass_started - rm /data/vendor/gps/beidou_started - rm /data/vendor/gps/smd_started - rm /data/vendor/gps/sv_cno.info - - chown gps system /sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby - chmod 0664 /dev/ttyBCM - chown gps system /dev/ttyBCM - chmod 0664 /dev/bbd_control - chown gps system /dev/bbd_control - chmod 0664 /dev/bbd_patch - chown gps system /dev/bbd_patch - chmod 0664 /dev/bbd_sensor - chown gps system /dev/bbd_sensor - on early-boot # Wait for insmod_sh to finish all common modules wait_for_prop vendor.common.modules.ready 1 From 03e01e352465183a8c026ffbe324510d75935308 Mon Sep 17 00:00:00 2001 From: Leo Chen Date: Thu, 23 May 2024 06:39:38 +0000 Subject: [PATCH 05/23] Update IDisplay to V12 Test: trigger test build Bug: 309897479 Change-Id: Id60df728563ccad7392f72a7e78c78b63a894929 Signed-off-by: Leo Chen --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 2aa37e9..59d5bf9 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -114,7 +114,7 @@ com.google.hardware.pixel.display - 11-12 + 12 IDisplay default From c20df78db9a63c308d5feb2c96f1a9befa3be653 Mon Sep 17 00:00:00 2001 From: Terry Huang Date: Thu, 30 May 2024 08:01:42 +0000 Subject: [PATCH 06/23] Add property for PDK ROM The property would be used to check if the ROM is PDK. Bug: 331725606 Change-Id: I0e1fa3366effb546a60b89c8bcf14fcd74dcb51f Test: Check the property in PDK build --- device.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device.mk b/device.mk index ad85c55..d9c45df 100644 --- a/device.mk +++ b/device.mk @@ -230,6 +230,8 @@ USE_WHI_GRIL_RECOVERY := true ifeq ($(USES_GOOGLE_DIALER_CARRIER_SETTINGS),true) USE_GOOGLE_DIALER := true USE_GOOGLE_CARRIER_SETTINGS := true +PRODUCT_PROPERTY_OVERRIDES += \ + ro.vendor.uses_google_dialer_carrier_settings=1 endif ifeq ($(USES_GOOGLE_PREBUILT_MODEM_SVC),true) From fc8c17c28b26891985d2ff678c1c3cf9be456280 Mon Sep 17 00:00:00 2001 From: jiangzining Date: Thu, 30 May 2024 14:39:15 +0800 Subject: [PATCH 07/23] [Scone] add BLUETOOTH_CONNECT to SCONE default permission Bug: 343608940 MBA Approval: b/330640278 Test: Build and Flash (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b74903d33ee1b8dbc3e09950d994aae379b5a937) Merged-In: I2aca6fbdc59e47d6e46af918d85661116b6424d8 Change-Id: I2aca6fbdc59e47d6e46af918d85661116b6424d8 --- default-permissions.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/default-permissions.xml b/default-permissions.xml index 8516cec..fc00a30 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -86,6 +86,8 @@ + + Date: Mon, 3 Jun 2024 17:49:35 +0800 Subject: [PATCH 08/23] zumapro: add build include for Recorder app in gs-common Test: build pass Bug: 338879856 Change-Id: I76ebf9f6d99857906dc3708274932898519e7b38 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index ad85c55..e566eaf 100644 --- a/device.mk +++ b/device.mk @@ -42,6 +42,7 @@ include device/google/gs-common/misc_writer/misc_writer.mk include device/google/gs-common/gyotaku_app/gyotaku.mk include device/google/gs-common/bootctrl/bootctrl_aidl.mk include device/google/gs-common/betterbug/betterbug.mk +include device/google/gs-common/recorder/recorder.mk include device/google/zumapro/dumpstate/item.mk From a09ad23552da9296c1c0afedcdd5d28f9ad46bcf Mon Sep 17 00:00:00 2001 From: Scott Wiest Date: Tue, 4 Jun 2024 18:05:40 +0000 Subject: [PATCH 09/23] Removing unneeded potentially harmful permissions in Creative Assistant Bug: 339334303 FLAG: EXEMPT Bugfix to remove the permissions that were flagged as harmful and are no longer being used. Change-Id: Ibc3915b2154cecf40a8484b2ffb8eef8a2ad52d0 --- default-permissions.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/default-permissions.xml b/default-permissions.xml index fc00a30..a0aa143 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -67,9 +67,6 @@ - - - From 6f9888658d3ec38cb1475e98babe919cd8537c30 Mon Sep 17 00:00:00 2001 From: Kah Xuan Lim Date: Tue, 4 Jun 2024 06:05:01 +0000 Subject: [PATCH 10/23] Disable modemml-tflite-service for aosp build For aosp build, the vendor module `modemml-tflite-service` is not included so it shouldn't be added as a system_server jar. Bug: 343341492 Bug: 343367700 Test: Build with target non-aosp targets in presubmit and aosp targets following the reproduce steps in b/343341492 Change-Id: Ib32ec2c31570eb3566c80de4ed510f17ec9e9a39 --- device.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device.mk b/device.mk index e47d425..28d1693 100644 --- a/device.mk +++ b/device.mk @@ -970,11 +970,13 @@ PRODUCT_PACKAGES += modem_svc_sit # 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 PRODUCT_SYSTEM_SERVER_JARS += modemml-tflite-service +endif # modem ML models configs ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From 31fbcddb278548f6cb22892e74b7cb47459816fe Mon Sep 17 00:00:00 2001 From: Utku Utkan Date: Wed, 5 Jun 2024 04:51:31 +0000 Subject: [PATCH 11/23] Remove ACCESS_FINE_LOCATION permission pregrant for PCS on ZumaPro FLAG: EXEMPT Cleanup of obsolete permission pregrant Bug: 345021501 Test: m && flashall Change-Id: I9cedfd754b27831c2176d9822babbd8bedfa16b3 --- default-permissions.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/default-permissions.xml b/default-permissions.xml index a0aa143..2d04542 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -59,7 +59,6 @@ - From f3fcd24811748a04351d3da6825b8ccf06b2c63e Mon Sep 17 00:00:00 2001 From: Scott Wiest Date: Tue, 4 Jun 2024 18:05:40 +0000 Subject: [PATCH 12/23] Removing unneeded potentially harmful permissions in Creative Assistant Bug: 339334303 FLAG: EXEMPT Bugfix to remove the permissions that were flagged as harmful and are no longer being used. Change-Id: Ibc3915b2154cecf40a8484b2ffb8eef8a2ad52d0 --- default-permissions.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/default-permissions.xml b/default-permissions.xml index fc00a30..a0aa143 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -67,9 +67,6 @@ - - - From 91126e3fd140ee84466bfbe7fac1049b8f762f26 Mon Sep 17 00:00:00 2001 From: Xiaofan Jiang Date: Tue, 28 May 2024 18:55:42 +0000 Subject: [PATCH 13/23] shamp: enable only for board with modem Bug: 341164599 Change-Id: I6e6575f7ba98a293dafd51a4825cdf9d335fbb14 --- device.mk | 150 +++++++++++++++++++++++++++--------------------------- 1 file changed, 74 insertions(+), 76 deletions(-) diff --git a/device.mk b/device.mk index 979e902..3b5cd54 100644 --- a/device.mk +++ b/device.mk @@ -218,12 +218,84 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.sys.hdcp_checking=always USE_LASSEN_OEMHOOK := true +ifneq ($(BOARD_WITHOUT_RADIO),true) # The "power-anomaly-sitril" is added into PRODUCT_SOONG_NAMESPACES when # $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true. -ifneq ($(BOARD_WITHOUT_RADIO),true) - PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril +PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril + +$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk) + +# 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 + +# 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 + +PRODUCT_SYSTEM_SERVER_JARS += modemml-tflite-service endif +# modem ML models configs +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_COPY_FILES += \ + device/google/zumapro/modem_ml/modem_ml_nnapi_models_userdebug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_models.conf \ + device/google/zumapro/modem_ml/modem_ml_tflite_models_userdebug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_tflite_models.conf +else +PRODUCT_COPY_FILES += \ + device/google/zumapro/modem_ml/modem_ml_nnapi_models_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_models.conf \ + device/google/zumapro/modem_ml/modem_ml_tflite_models_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_tflite_models.conf +endif + +# modem logging binary/configs +PRODUCT_PACKAGES += modem_logging_control + +# libeomservice_proxy binary/configs +PRODUCT_PACKAGES += liboemservice_proxy_default + +# modem logging configs +PRODUCT_PACKAGES += \ + logging.conf \ + default.cfg \ + default.nprf \ + default_metrics.xml \ + Pixel_stability.cfg \ + Pixel_stability.nprf \ + extensive_logging.conf + +# Vendor modem extensive logging default property +PRODUCT_PROPERTY_OVERRIDES += \ + persist.vendor.modem.extensive_logging_enabled=false + +# Pixel Logger +include hardware/google/pixel/PixelLogger/PixelLogger.mk + +# RIL extension service +ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT))) +include device/google/gs-common/pixel_ril/ril.mk +endif + +# Use Lassen specifc Shared Modem Platform +SHARED_MODEM_PLATFORM_VENDOR := lassen + +else # ifneq ($(BOARD_WITHOUT_RADIO),true) + +# Pixel Logger +BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/logger_app + +endif # ifneq ($(BOARD_WITHOUT_RADIO),true) + +# Shared Modem Platform +include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk + # Use for GRIL USES_LASSEN_MODEM := true USE_WHI_GRIL_RECOVERY := true @@ -957,10 +1029,6 @@ USE_EARLY_SEND_DEVICE_INFO := true #$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk) #$(call inherit-product, vendor/google_devices/zumapro/proprietary/device-vendor.mk) -ifneq ($(BOARD_WITHOUT_RADIO),true) -$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk) -endif - $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) #$(call inherit-product, hardware/google_devices/exynos5/exynos5.mk) #$(call inherit-product-if-exists, hardware/google_devices/zumapro/zumapro.mk) @@ -975,58 +1043,6 @@ PRODUCT_COPY_FILES += \ device/google/zumapro/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ -ifneq ($(BOARD_WITHOUT_RADIO),true) -# 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 - -# 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 - -PRODUCT_SYSTEM_SERVER_JARS += modemml-tflite-service -endif - -# modem ML models configs -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_COPY_FILES += \ - device/google/zumapro/modem_ml/modem_ml_nnapi_models_userdebug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_models.conf \ - device/google/zumapro/modem_ml/modem_ml_tflite_models_userdebug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_tflite_models.conf -else -PRODUCT_COPY_FILES += \ - device/google/zumapro/modem_ml/modem_ml_nnapi_models_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_models.conf \ - device/google/zumapro/modem_ml/modem_ml_tflite_models_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_tflite_models.conf -endif - -# modem logging binary/configs -PRODUCT_PACKAGES += modem_logging_control - -# libeomservice_proxy binary/configs -PRODUCT_PACKAGES += liboemservice_proxy_default - -# modem logging configs -PRODUCT_PACKAGES += \ - logging.conf \ - default.cfg \ - default.nprf \ - default_metrics.xml \ - Pixel_stability.cfg \ - Pixel_stability.nprf \ - extensive_logging.conf - -# Vendor modem extensive logging default property -PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.modem.extensive_logging_enabled=false -endif - # Vibrator Diag PRODUCT_PACKAGES_DEBUG += \ diag-vibrator \ @@ -1164,13 +1180,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Project include hardware/google/pixel/common/pixel-common-device.mk -# Pixel Logger -ifneq ($(BOARD_WITHOUT_RADIO),true) -include hardware/google/pixel/PixelLogger/PixelLogger.mk -else -BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/logger_app -endif - # RadioExt Version USES_RADIOEXT_V1_7 = true @@ -1203,13 +1212,6 @@ include hardware/google/pixel/HardwareInfo/HardwareInfo.mk # UFS: the script is used to select the corresponding firmware to run FFU. PRODUCT_PACKAGES_DEBUG += ufs_firmware_update.sh -ifneq ($(BOARD_WITHOUT_RADIO),true) -# RIL extension service -ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT))) -include device/google/gs-common/pixel_ril/ril.mk -endif -endif - SUPPORT_VENDOR_SATELLITE_SERVICE := true # Telephony satellite geofence data file @@ -1234,7 +1236,3 @@ PRODUCT_PROPERTY_OVERRIDES += \ # since it can't be overridden from /vendor. PRODUCT_PRODUCT_PROPERTIES += \ dumpstate.strict_run=false - -# Shared Modem Platform -SHARED_MODEM_PLATFORM_VENDOR := lassen -include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk From 5e28bfad5ef3e2f5476e892cc876e8eebf5ca612 Mon Sep 17 00:00:00 2001 From: Kah Xuan Lim Date: Fri, 7 Jun 2024 01:30:08 +0000 Subject: [PATCH 14/23] Add modemml-tflite-service to system_ext Bug: 343367700 Test: Build pass Change-Id: I2dc03a4f253a53db536a38041bc2714960577b41 --- device.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/device.mk b/device.mk index 3b5cd54..f71f038 100644 --- a/device.mk +++ b/device.mk @@ -233,15 +233,7 @@ ifeq (,$(filter aosp_%,$(TARGET_PRODUCT))) 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 - -PRODUCT_SYSTEM_SERVER_JARS += modemml-tflite-service +PRODUCT_SYSTEM_SERVER_JARS += system_ext:modemml-tflite-service endif # modem ML models configs From 8a0c1ccc9199063a2ef382ddb942b74834153f3c Mon Sep 17 00:00:00 2001 From: Dennis Shen Date: Fri, 7 Jun 2024 13:09:09 +0000 Subject: [PATCH 15/23] switch over to use new storage read api instead of server_configurable_flags, this new read api lib will be needed for new codegened aconfig flag lib. Bug: 321077378 Test m and avd Change-Id: Ib25c24bf437f2de5a557653ef6ed42f8fbac65e1 --- usb/usb/Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp index e70985c..20ba592 100644 --- a/usb/usb/Android.bp +++ b/usb/usb/Android.bp @@ -55,6 +55,7 @@ cc_binary { "libbinder_ndk", "libprotobuf-cpp-lite", "server_configurable_flags", + "libaconfig_storage_read_api_cc", ], static_libs: [ "libpixelusb-aidl", From fae17e2f416a7c205375d63503770a6e111fcfc3 Mon Sep 17 00:00:00 2001 From: chenkris Date: Mon, 10 Jun 2024 03:20:45 +0000 Subject: [PATCH 16/23] zumapro: build fingerprint dump Bug: 346450599 Test: adb bugreport Change-Id: Ic623a7b69110e1bb9c69544945d6180fbae2d30f --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 1fdf915..619d639 100644 --- a/device.mk +++ b/device.mk @@ -43,6 +43,7 @@ include device/google/gs-common/gyotaku_app/gyotaku.mk include device/google/gs-common/bootctrl/bootctrl_aidl.mk include device/google/gs-common/betterbug/betterbug.mk include device/google/gs-common/recorder/recorder.mk +include device/google/gs-common/fingerprint/fingerprint.mk include device/google/zumapro/dumpstate/item.mk From 77e5ba0426d9ba7b8daadae2aa2898207b49b172 Mon Sep 17 00:00:00 2001 From: Kah Xuan Lim Date: Tue, 11 Jun 2024 03:19:55 +0000 Subject: [PATCH 17/23] Revert "Add modemml-tflite-service to system_ext" Revert submission 27728915-modemml-tflite-system-ext Reason for revert: Build breakage at ab/11950917 Reverted changes: /q/submissionid:27728915-modemml-tflite-system-ext Change-Id: I4b6318df2c29c3cd71e4925a50328c5e3902f543 --- device.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index f71f038..3b5cd54 100644 --- a/device.mk +++ b/device.mk @@ -233,7 +233,15 @@ ifeq (,$(filter aosp_%,$(TARGET_PRODUCT))) PRODUCT_PACKAGES += modemml-tflite-service \ libtensorflowlite_jni -PRODUCT_SYSTEM_SERVER_JARS += system_ext:modemml-tflite-service +# 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 + +PRODUCT_SYSTEM_SERVER_JARS += modemml-tflite-service endif # modem ML models configs From 4fb1f69c60db1635308b121ba612b679e437684c Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Tue, 11 Jun 2024 05:51:07 +0000 Subject: [PATCH 18/23] pixelstats: add speaker_version sysfs for VendorSpeakerStatsReported Bug: 326342880 Test: Local Test Change-Id: I78344d36c0bfa0e0c4d028e7ae8e0acd4a98c396 --- pixelstats/service.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index dac4a48..e76a4d6 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -130,7 +130,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { "/sys/devices/platform/exynos-drm/primary-panel/error_count_unknown", "/sys/devices/platform/exynos-drm/secondary-panel/error_count_te", "/sys/devices/platform/exynos-drm/secondary-panel/error_count_unknown", - } + }, + .SpeakerVersionPath = "/sys/devices/platform/audiometrics/speaker_version" }; const struct UeventListener::UeventPaths ueventPaths = { From 3f2b22c54c99a904452bcb7d97bf9f42ca9a9c1f Mon Sep 17 00:00:00 2001 From: Hsiu-Chang Chen Date: Tue, 11 Jun 2024 15:32:53 +0800 Subject: [PATCH 19/23] wifi: Move WIFI_BRCM_OPEN_SOURCE_MULTI_AKM to project-specific folder Since not all projects on this platform support open source multiple akm, move WIFI_BRCM_OPEN_SOURCE_MULTI_AKM to project-specific folder. Bug: 345118973 Test: Build Pass Change-Id: I80cf83e06eb1199dd4a9b702a9dec7f2af0463ec --- device.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/device.mk b/device.mk index 1fdf915..daad46c 100644 --- a/device.mk +++ b/device.mk @@ -852,8 +852,6 @@ PRODUCT_PACKAGES += wpa_supplicant.conf WIFI_PRIV_CMD_UPDATE_MBO_CELL_STATUS := enabled -WIFI_BRCM_OPEN_SOURCE_MULTI_AKM := enabled - ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES += wpa_cli PRODUCT_PACKAGES += hostapd_cli From 931d5dc1638b9dc2a5f39bfaa0f61a0dd913cf04 Mon Sep 17 00:00:00 2001 From: Cathy Hsu Date: Tue, 4 Jun 2024 08:58:11 +0000 Subject: [PATCH 20/23] Remove display related warnings Bug: 338548109 Bug: 340971451 Bug: 340971442 Test: No display warnings show Change-Id: I38ae75b67ce2779cd908ab31ef4fb1a61e00e45e --- BoardConfig-common.mk | 4 ---- device.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index e8f2f7c..099c238 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -150,8 +150,6 @@ endif #display_unit_test ifeq ($(USES_DEVICE_GOOGLE_ZUMAPRO),true) -# TODO(b/272725898): Needs to check with owner later -$(warning display_unit_test set to zuma on zumapro target) $(call soong_config_set,display_unit_test,soc,zuma) endif @@ -280,8 +278,6 @@ HWC_SUPPORT_COLOR_TRANSFORM := true BOARD_USES_EXYNOS_AFBC_FEATURE := true #BOARD_USES_HDRUI_GLES_CONVERSION := true -# TODO(b/272725898): Needs to check with owner later -$(warning BOARD_LIBACRYL_DEFAULT_COMPOSITOR set to zuma on zumapro target) BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_zuma BOARD_LIBACRYL_G2D_HDR_PLUGIN := libacryl_hdr_plugin diff --git a/device.mk b/device.mk index daad46c..a92b247 100644 --- a/device.mk +++ b/device.mk @@ -67,8 +67,6 @@ ifeq ($(USE_PIXEL_GRALLOC),true) PRODUCT_SOONG_NAMESPACES += hardware/google/gchips/GrallocHAL endif -# TODO(b/272725898): Needs to check with owner later -$(warning hardware/google/graphics/zuma set to zuma on zumapro target) PRODUCT_SOONG_NAMESPACES += \ hardware/google/av \ hardware/google/gchips \ @@ -935,8 +933,6 @@ PRODUCT_SOONG_NAMESPACES += \ PRODUCT_PACKAGES += \ trusty_metricsd -# TODO(b/272725898): Needs to check with owner later -$(warning displaycolor_platform set to zuma on zumapro target) $(call soong_config_set,google_displaycolor,displaycolor_platform,zuma) PRODUCT_PACKAGES += \ android.hardware.composer.hwc3-service.pixel \ From 9bcf2600ec395be98bdf5d83f95a361d29aea0cf Mon Sep 17 00:00:00 2001 From: Hiroshi Akiyama Date: Fri, 7 Jun 2024 21:58:00 +0000 Subject: [PATCH 21/23] dump_power: parse vimon in dumpstate board Bug: 345835957 Test: generate bugreport Flag: EXEMPT bugfix Change-Id: Id611cd76a0133e1525ffe74e82a6c0d940e39aab Signed-off-by: Hiroshi Akiyama --- dumpstate/dump_power.cpp | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dumpstate/dump_power.cpp b/dumpstate/dump_power.cpp index e8989f0..a5b4253 100644 --- a/dumpstate/dump_power.cpp +++ b/dumpstate/dump_power.cpp @@ -776,6 +776,11 @@ void dumpMitigationDirs() { }; const int eraseCnt[] = {6, 6, 4, 0}; const bool useTitleRow[] = {true, true, true, false}; + const char *vimon_name = "vimon_buff"; + const char delimiter = '\n'; + const int vimon_len = strlen(vimon_name); + const double VIMON_VMULT = 7.8122e-5; + const double VIMON_IMULT = 7.8125e-4; std::vector files; std::string content; @@ -783,6 +788,9 @@ void dumpMitigationDirs() { std::string source; std::string subModuleName; std::string readout; + char *endptr; + + bool vimon_found = false; for (int i = 0; i < paramCount; i++) { printTitle(titles[i]); @@ -800,11 +808,40 @@ void dumpMitigationDirs() { readout = android::base::Trim(content); + if (strncmp(file.c_str(), vimon_name, vimon_len) == 0) + vimon_found = true; + subModuleName = std::string(file); subModuleName.erase(subModuleName.find(paramSuffix[i]), eraseCnt[i]); if (useTitleRow[i]) { printf("%s \t%s\n", subModuleName.c_str(), readout.c_str()); + } else if (vimon_found) { + + std::vector tokens; + std::istringstream tokenStream(readout); + std::string token; + + while (std::getline(tokenStream, token, delimiter)) { + tokens.push_back(token); + } + + bool oddEntry = true; + for (auto &hexval : tokens) { + int val = strtol(hexval.c_str(), &endptr, 16); + if (*endptr != '\0') { + printf("invalid vimon readout\n"); + break; + } + if (oddEntry) { + int vbatt = int(1000 * (val * VIMON_VMULT)); + printf("vimon vbatt: %d ", vbatt); + } else { + int ibatt = int(1000 * (val * VIMON_IMULT)); + printf("ibatt: %d\n", ibatt); + } + oddEntry = !oddEntry; + } } else { printf("%s=%s\n", subModuleName.c_str(), readout.c_str()); } From a22b308d42f721b09fa3d4f50c3ba9c456fe62a0 Mon Sep 17 00:00:00 2001 From: Kyle Tso Date: Wed, 12 Jun 2024 17:14:02 +0800 Subject: [PATCH 22/23] usb: Add retry on role switch Bug: 341996696 Change-Id: I8caa65288af1588d24fea4aa6c5768d45d69bbd5 Signed-off-by: Kyle Tso (cherry picked from commit ef5856a4474002cc35a51377adffddd4cb239796) --- usb/usb/Usb.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index 4bdd5ed..1a03917 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -672,6 +672,10 @@ ScopedAStatus Usb::switchRole(const string& in_portName, const PortRole& in_role fp = fopen(filename.c_str(), "w"); if (fp != NULL) { int ret = fputs(convertRoletoString(in_role).c_str(), fp); + if (ret == EAGAIN) { + std::this_thread::sleep_for(std::chrono::milliseconds(700)); + ret = fputs(convertRoletoString(in_role).c_str(), fp); + } fclose(fp); if ((ret != EOF) && ReadFileToString(filename, &written)) { written = Trim(written); From 4f43c1cdaf294cc3dc0d654113733ddc5e0582e9 Mon Sep 17 00:00:00 2001 From: Kyle Tso Date: Thu, 13 Jun 2024 16:54:37 +0800 Subject: [PATCH 23/23] usb: Log for retry on role switch Add a log for the retry. Also define the sleep time in the header file. Bug: 341996696 Change-Id: Ib3cc0c6ad576e7cda26b7f50cdc61d52e6349c78 Signed-off-by: Kyle Tso (cherry picked from commit d17fdff5f81cff76adaa75d50f26318be8048123) --- usb/usb/Usb.cpp | 3 ++- usb/usb/Usb.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index 1a03917..d8afb80 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -673,7 +673,8 @@ ScopedAStatus Usb::switchRole(const string& in_portName, const PortRole& in_role if (fp != NULL) { int ret = fputs(convertRoletoString(in_role).c_str(), fp); if (ret == EAGAIN) { - std::this_thread::sleep_for(std::chrono::milliseconds(700)); + ALOGI("role switch busy, retry in %d ms", ROLE_SWAP_RETRY_MS); + std::this_thread::sleep_for(std::chrono::milliseconds(ROLE_SWAP_RETRY_MS)); ret = fputs(convertRoletoString(in_role).c_str(), fp); } fclose(fp); diff --git a/usb/usb/Usb.h b/usb/usb/Usb.h index 96af846..8f0c3a0 100644 --- a/usb/usb/Usb.h +++ b/usb/usb/Usb.h @@ -80,6 +80,7 @@ constexpr char kGadgetName[] = "11210000.dwc3"; #define DISPLAYPORT_IRQ_HPD_COUNT_CHECK 3 #define DISPLAYPORT_POLL_WAIT_MS 100 +#define ROLE_SWAP_RETRY_MS 700 #define SVID_DISPLAYPORT "ff01" #define SVID_THUNDERBOLT "8087"