Snap for 9284182 from 95e0d9bdb9 to udc-release

Change-Id: I8e7be23b99a9e1ba2973511e1dc59090feca6f38
This commit is contained in:
Android Build Coastguard Worker 2022-11-12 04:02:41 +00:00
commit 9fb6e4de5a
6 changed files with 5 additions and 29 deletions

View file

@ -936,7 +936,7 @@ endif
#$(call inherit-product-if-exists, hardware/google_devices/gs101/gs101.mk)
#$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk)
#$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk)
$(call inherit-product-if-exists, vendor/google/sensors/usf/android/usf_efw_product.mk)
include device/google/gs-common/sensors/sensors.mk
$(call inherit-product-if-exists, vendor/google/services/LyricCameraHAL/src/build/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google/camera/devices/whi/device-vendor.mk)
@ -996,7 +996,7 @@ PRODUCT_PACKAGES += \
android.hardware.audio.effect@7.0-impl \
android.hardware.bluetooth.audio-impl \
android.hardware.soundtrigger@2.3-impl \
vendor.google.whitechapel.audio.audioext@3.0-impl
vendor.google.whitechapel.audio.audioext@4.0-impl
#Audio HAL libraries
PRODUCT_PACKAGES += \

View file

@ -129,7 +129,7 @@
</hal>
<hal format="hidl">
<name>vendor.google.whitechapel.audio.audioext</name>
<version>3.0</version>
<version>4.0</version>
<interface>
<name>IAudioExt</name>
<instance>default</instance>

View file

@ -259,7 +259,6 @@ Dumpstate::Dumpstate()
{ "thermal", [this](int fd) { dumpThermalSection(fd); } },
{ "touch", [this](int fd) { dumpTouchSection(fd); } },
{ "display", [this](int fd) { dumpDisplaySection(fd); } },
{ "sensors-usf", [this](int fd) { dumpSensorsUSFSection(fd); } },
{ "misc", [this](int fd) { dumpMiscSection(fd); } },
{ "camera", [this](int fd) { dumpCameraSection(fd); } },
} {
@ -913,28 +912,6 @@ void Dumpstate::dumpDisplaySection(int fd) {
}
}
// Dump items related to sensors usf.
void Dumpstate::dumpSensorsUSFSection(int fd) {
CommandOptions options = CommandOptions::WithTimeout(2).Build();
RunCommandToFd(fd, "USF statistics",
{"/vendor/bin/sh", "-c", "usf_stats get --all"},
options);
if (!PropertiesHelper::IsUserBuild()) {
// Not a user build, if this is also not a production device dump the USF registry.
std::string hwRev = ::android::base::GetProperty(HW_REVISION, "");
if (hwRev.find("PROTO") != std::string::npos ||
hwRev.find("EVT") != std::string::npos ||
hwRev.find("DVT") != std::string::npos) {
RunCommandToFd(fd, "USF Registry",
{"/vendor/bin/sh", "-c", "usf_reg_edit save -"},
options);
RunCommandToFd(fd, "USF Last Stat Buffer",
{"/vendor/bin/sh", "-c", "cat /data/vendor/sensors/debug/stats.history"},
options);
}
}
}
// Dump items that don't fit well into any other section
void Dumpstate::dumpMiscSection(int fd) {
RunCommandToFd(fd, "VENDOR PROPERTIES", {"/vendor/bin/getprop"});

View file

@ -55,7 +55,6 @@ class Dumpstate : public BnDumpstateDevice {
void dumpDevfreqSection(int fd);
void dumpMemorySection(int fd);
void dumpDisplaySection(int fd);
void dumpSensorsUSFSection(int fd);
void dumpMiscSection(int fd);
void dumpCameraSection(int fd);
};

View file

@ -82,7 +82,7 @@
<hal format="hidl">
<name>vendor.google.whitechapel.audio.audioext</name>
<transport>hwbinder</transport>
<version>3.0</version>
<version>4.0</version>
<interface>
<name>IAudioExt</name>
<instance>default</instance>

View file

@ -74,7 +74,7 @@
<hal format="hidl">
<name>vendor.google.whitechapel.audio.audioext</name>
<transport>hwbinder</transport>
<version>3.0</version>
<version>4.0</version>
<interface>
<name>IAudioExt</name>
<instance>default</instance>