From f1366bab96fd28170b77cc28dbca0448480ce605 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Fri, 17 May 2024 18:23:39 +0800 Subject: [PATCH 1/3] Move PRODUCT_SHIPPING_API_LEVEL to defined by device Bug: 312876454 Flag: EXEMPT refactor Change-Id: I872dbd5e262516a32a47397d8413dcfce18dd05a --- device.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 3389983..f9a01c8 100644 --- a/device.mk +++ b/device.mk @@ -395,6 +395,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # GRAPHICS - GPU (end) # #################### +PRODUCT_SHIPPING_API_LEVEL := $(SHIPPING_API_LEVEL) + # Device Manifest, Device Compatibility Matrix for Treble DEVICE_MANIFEST_FILE := \ device/google/zumapro/manifest.xml @@ -419,8 +421,6 @@ DEVICE_MATRIX_FILE := \ DEVICE_PACKAGE_OVERLAYS += device/google/zumapro/overlay -PRODUCT_SHIPPING_API_LEVEL := 34 - # RKP VINTF -include vendor/google_nos/host/android/hals/keymaster/aidl/strongbox/RemotelyProvisionedComponent-citadel.mk From 248f3538871a6602c6fc211b2c63915aebdce17d Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 21 May 2024 18:20:12 +0800 Subject: [PATCH 2/3] Add manifest for VINTF target FCM level 202404 Target FCM level 202404 deprecated the following HALs: android.hardware.graphics.mapper Target FCM level 202404 requires the newer version of the following HALs: android.hardware.radio.config android.hardware.radio.data android.hardware.radio.messaging android.hardware.radio.modem android.hardware.radio.network android.hardware.radio.sim android.hardware.radio.voice Add the previous version of these HALs into the customized product FCM before ready to remove them from device manifest Bug: 312876454 Flag: EXEMPT NDK Change-Id: Ic9af791e7aa2027bf8d7ff9c39cf097323d7b68a --- device.mk | 16 +- device_framework_matrix_product_202404.xml | 264 +++++++++++++++++++++ manifest_202404.xml | 15 ++ 3 files changed, 290 insertions(+), 5 deletions(-) create mode 100644 device_framework_matrix_product_202404.xml create mode 100644 manifest_202404.xml diff --git a/device.mk b/device.mk index f9a01c8..ba19212 100644 --- a/device.mk +++ b/device.mk @@ -398,8 +398,19 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_SHIPPING_API_LEVEL := $(SHIPPING_API_LEVEL) # Device Manifest, Device Compatibility Matrix for Treble +# +# Install product specific framework compatibility matrix +# (TODO: b/169535506) This includes the FCM for system_ext and product partition. +# It must be split into the FCM of each partition. +ifeq ($(PRODUCT_SHIPPING_API_LEVEL),35) +DEVICE_MANIFEST_FILE := \ + device/google/zumapro/manifest_202404.xml +DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/zumapro/device_framework_matrix_product_202404.xml +else DEVICE_MANIFEST_FILE := \ device/google/zumapro/manifest.xml +DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/zumapro/device_framework_matrix_product.xml +endif ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) DEVICE_MANIFEST_FILE += \ @@ -1186,11 +1197,6 @@ include hardware/google/pixel/wifi_ext/device.mk # Battery Stats Viewer PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer -# Install product specific framework compatibility matrix -# (TODO: b/169535506) This includes the FCM for system_ext and product partition. -# It must be split into the FCM of each partition. -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/zumapro/device_framework_matrix_product.xml - # Keymint configuration PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml \ diff --git a/device_framework_matrix_product_202404.xml b/device_framework_matrix_product_202404.xml new file mode 100644 index 0000000..1dbfb17 --- /dev/null +++ b/device_framework_matrix_product_202404.xml @@ -0,0 +1,264 @@ + + + android.hardware.boot + IBootControl/default + + + android.hardware.graphics.composer3 + 2 + + IComposer + default + + + + android.hardware.graphics.mapper + 4.0 + + IMapper + default + + + + android.hardware.radio + 1.2 + + ISap + slot2 + + + + android.hardware.radio.config + 2 + + IRadioConfig + default + + + + android.hardware.radio.data + 2 + + IRadioData + slot1 + slot2 + slot3 + + + + android.hardware.radio.messaging + 2 + + IRadioMessaging + slot1 + slot2 + slot3 + + + + android.hardware.radio.modem + 2 + + IRadioModem + slot1 + slot2 + slot3 + + + + android.hardware.radio.network + 2 + + IRadioNetwork + slot1 + slot2 + slot3 + + + + android.hardware.radio.sim + 2 + + IRadioSim + slot1 + slot2 + slot3 + + + + android.hardware.radio.voice + 2 + + IRadioVoice + slot1 + slot2 + slot3 + + + + android.hardware.vibrator + 2 + + IVibrator + dual + + + + android.hardware.wifi.hostapd + 1 + + IHostapd + default + + + + android.vendor.samsung_slsi.telephony.hardware.radio + 1.1 + + IOemSamsungslsi + slot1 + slot2 + + + + com.fingerprints33.extension + 1.0 + + IFingerprintAuthenticator + default + + + IFingerprintCalibration + default + + + IFingerprintEngineering + default + + + IFingerprintNavigation + default + + + IFingerprintRecalibration + default + + + IFingerprintSenseTouch + default + + + IFingerprintSensorTest + default + + + + com.google.face.debug + 3-4 + + IDebugHost + default + + + IDebugManager + default + + + + com.google.edgetpu + 2 + + IEdgeTpuVendorService + default + + + + com.google.edgetpu.dba + 1 + + IDevice + default + + + + com.google.edgetpu.tachyon + 1 + + IComputeService + default + + + + com.google.hardware.pixel.display + 12 + + IDisplay + default + + + + hardware.qorvo.uwb + + IUwbVendor + default + + + + vendor.goodix.hardware.biometrics.fingerprint + 2.1 + + IGoodixFingerprintDaemon + default + + + + vendor.google.google_battery + 2-3 + + IGoogleBattery + default + + + + vendor.google.radioext + 1.7 + + IRadioExt + default + + + + vendor.google.wifi_ext + 2-3 + + IWifiExt + default + + + + vendor.samsung_slsi.telephony.hardware.oemservice + 1.0 + + IOemService + dm0 + dm1 + sced0 + + + + com.google.pixel.modem.logmasklibrary + 1 + + ILiboemserviceProxy + default + + + + vendor.samsung_slsi.telephony.hardware.radioExternal + 1.1 + + IOemSlsiRadioExternal + rilExternal + + + diff --git a/manifest_202404.xml b/manifest_202404.xml new file mode 100644 index 0000000..99dd18d --- /dev/null +++ b/manifest_202404.xml @@ -0,0 +1,15 @@ + + + android.hardware.graphics.mapper + passthrough + 4.0 + + IMapper + default + + + + android.hardware.boot + IBootControl/default + + From 77f2807cf9be9d42f8566d4d17045b8874eb6e34 Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Tue, 18 Jun 2024 21:05:52 +0800 Subject: [PATCH 3/3] dump_power: add RT9470G dump into bugreport 1. power supply properties 2. registers Bug: 347914940 Test: adb bugreport Flag: EXEMPT bugfix Change-Id: Ie6f2de3acef515665727f3e3bc0e4373778ffe07 Signed-off-by: Jack Wu --- dumpstate/dump_power.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dumpstate/dump_power.cpp b/dumpstate/dump_power.cpp index a5b4253..a83506e 100644 --- a/dumpstate/dump_power.cpp +++ b/dumpstate/dump_power.cpp @@ -235,6 +235,21 @@ void dumpPowerSupplyDock() { } } +void dumpSecondCharge() { + const char* powerSupplyPropertySecChgTitle = "Power supply property rt9471"; + const char* powerSupplyPropertySecChgFile = "/sys/class/power_supply/rt9471/uevent"; + const char *secChgTitle = "RT9470G"; + const char *secChgFile = "/sys/devices/platform/10ca0000.hsi2c/i2c-10/10-005b/registers_dump"; + + if (isValidFile(powerSupplyPropertySecChgFile)) { + dumpFileContent(powerSupplyPropertySecChgTitle, powerSupplyPropertySecChgFile); + } + + if (isValidFile(secChgFile)) { + dumpFileContent(secChgTitle, secChgFile); + } +} + void dumpLogBufferTcpm() { const char* logbufferTcpmTitle = "Logbuffer TCPM"; const char* logbufferTcpmFile = "/dev/logbuffer_tcpm"; @@ -1069,6 +1084,7 @@ int main() { dumpPowerStatsTimes(); dumpAcpmStats(); dumpPowerSupplyStats(); + dumpSecondCharge(); dumpMaxFg(); dumpPowerSupplyDock(); dumpLogBufferTcpm();