Snap for 12537680 from 9e47244715 to 25Q1-release

Change-Id: Ic97ab2c0e7d08aac976f32b5a21970ba77b4a986
This commit is contained in:
Android Build Coastguard Worker 2024-10-22 23:03:38 +00:00
commit c141f54549
7 changed files with 21 additions and 26 deletions

View file

@ -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 += \

View file

@ -1,12 +1,4 @@
<compatibility-matrix version="1.0" type="framework">
<hal format="hidl">
<name>vendor.google.audiometricext</name>
<version>1.0</version>
<interface>
<name>IAudioMetricExt</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl">
<name>vendor.google.whitechapel.audio.extension</name>
<version>4</version>

View file

@ -1,11 +1,2 @@
<manifest version="1.0" type="device">
<hal format="hidl">
<name>vendor.google.audiometricext</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IAudioMetricExt</name>
<instance>default</instance>
</interface>
</hal>
</manifest>

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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