From afd55f92b90d646b7b7c735d47a82605a670b5d2 Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Mon, 30 Sep 2024 06:24:59 +0000 Subject: [PATCH 1/2] [Audio AIDL] Move audiometricext to HIDL only. Previously, audiometricext module which is HIDL module is mistakenly included in AIDL rom. Test: Local Build on both HIDL and AIDL devices Flag: EXEMPT bugfix Bug: 369772495 Change-Id: Ic56fa134056afa782440a8f1dcaa032df481bcc2 --- aoc/aoc.mk | 6 ------ audio/aidl/device_framework_matrix_product.xml | 8 -------- audio/aidl/manifest.xml | 9 --------- audio/hidl_gs101.mk | 8 +++++++- audio/hidl_gs201.mk | 6 ++++++ audio/hidl_zuma.mk | 6 ++++++ 6 files changed, 19 insertions(+), 24 deletions(-) diff --git a/aoc/aoc.mk b/aoc/aoc.mk index 136bb42..9ee4517 100644 --- a/aoc/aoc.mk +++ b/aoc/aoc.mk @@ -4,12 +4,6 @@ PRODUCT_PACKAGES += dump_aoc \ aocd \ aocxd -ifeq (,$(filter aosp_%,$(TARGET_PRODUCT))) -# IAudioMetricExt HIDL -PRODUCT_PACKAGES += \ - vendor.google.audiometricext@1.0-service-vendor -endif - # If AoC Daemon is not present on this build, load firmware at boot via rc ifeq ($(wildcard vendor/google/whitechapel/aoc/aocd),) PRODUCT_COPY_FILES += \ diff --git a/audio/aidl/device_framework_matrix_product.xml b/audio/aidl/device_framework_matrix_product.xml index 0e7e998..8cdb540 100644 --- a/audio/aidl/device_framework_matrix_product.xml +++ b/audio/aidl/device_framework_matrix_product.xml @@ -1,12 +1,4 @@ - - vendor.google.audiometricext - 1.0 - - IAudioMetricExt - default - - vendor.google.whitechapel.audio.extension 3 diff --git a/audio/aidl/manifest.xml b/audio/aidl/manifest.xml index 237aa4a..daeb1c4 100644 --- a/audio/aidl/manifest.xml +++ b/audio/aidl/manifest.xml @@ -1,11 +1,2 @@ - - vendor.google.audiometricext - hwbinder - 1.0 - - IAudioMetricExt - default - - diff --git a/audio/hidl_gs101.mk b/audio/hidl_gs101.mk index f764e7a..4ccbbfb 100644 --- a/audio/hidl_gs101.mk +++ b/audio/hidl_gs101.mk @@ -32,8 +32,14 @@ PRODUCT_PACKAGES += \ libamcsextfile \ audio_amcs_ext \ +ifeq (,$(filter aosp_%,$(TARGET_PRODUCT))) +# IAudioMetricExt HIDL +PRODUCT_PACKAGES += \ + vendor.google.audiometricext@1.0-service-vendor +endif + BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hidl include device/google/gs-common/audio/common.mk -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/audio/hidl/device_framework_matrix_product_gs101.xml +DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/audio/hidl/device_framework_matrix_product_gs101.xml \ No newline at end of file diff --git a/audio/hidl_gs201.mk b/audio/hidl_gs201.mk index 1438b27..c183b9a 100644 --- a/audio/hidl_gs201.mk +++ b/audio/hidl_gs201.mk @@ -32,6 +32,12 @@ PRODUCT_PACKAGES += \ audio_spk_35l41 \ sound_trigger.primary.$(TARGET_BOARD_PLATFORM) +ifeq (,$(filter aosp_%,$(TARGET_PRODUCT))) +# IAudioMetricExt HIDL +PRODUCT_PACKAGES += \ + vendor.google.audiometricext@1.0-service-vendor +endif + BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hidl include device/google/gs-common/audio/common.mk diff --git a/audio/hidl_zuma.mk b/audio/hidl_zuma.mk index 41dd02a..6fb3449 100644 --- a/audio/hidl_zuma.mk +++ b/audio/hidl_zuma.mk @@ -35,6 +35,12 @@ PRODUCT_PACKAGES += \ audio_hdmi_aoc \ sound_trigger.primary.$(TARGET_BOARD_PLATFORM) +ifeq (,$(filter aosp_%,$(TARGET_PRODUCT))) +# IAudioMetricExt HIDL +PRODUCT_PACKAGES += \ + vendor.google.audiometricext@1.0-service-vendor +endif + BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hidl BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hdmi_audio From c3a0ad4d1cfce95fab67ce8db0bb9acb556345a0 Mon Sep 17 00:00:00 2001 From: Randall Huang Date: Tue, 22 Oct 2024 13:13:14 +0800 Subject: [PATCH 2/2] storage: adjust ufs error history design Bug: 359746077 Test: adb bugreport Change-Id: I32d1cab81351285e1f9ea770169c8be2246f3df7 Signed-off-by: Randall Huang --- storage/dump_storage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/dump_storage.cpp b/storage/dump_storage.cpp index 47c5e76..272b1ee 100644 --- a/storage/dump_storage.cpp +++ b/storage/dump_storage.cpp @@ -229,8 +229,8 @@ int main() { read_buffer(19, 131072, "skhynix_13_ufs_err_history.dat"); } else { read_buffer(0, 4096, "skhynix_00_ufs_err_history.dat"); - read_buffer(16, 524288, "skhynix_10_ufs_err_history.dat"); - read_buffer(17, 524288, "skhynix_11_ufs_err_history.dat"); + read_buffer(16, 8388608, "skhynix_10_ufs_err_history.dat"); + read_buffer(17, 8388608, "skhynix_11_ufs_err_history.dat"); } break; case 0x1CE: //SAMSUNG