From be25a86c46ad0b5ad07be09760118ddd1583a6ad Mon Sep 17 00:00:00 2001 From: Wiwit Rifa'i Date: Tue, 16 Aug 2022 13:02:49 +0800 Subject: [PATCH 1/2] dumpstate: add HWC fence state, error log, and debug dump files Add some HWC log files in /data/vendor/log/hwc to dumpstate, i.e. [1] hwc_fence_state.txt: contains the dump of fence state when there's a fence leak warning. We can also execute `vndservice call Exynos.HWCService 11 i32 0 i32 308 i32 1` to trigger the dump to this file. The size of this file is limited to about 1 MB. [2] hwc_error_log.txt: contains some early logs of ALOGE() from HWC. The size of this file is limited to about 1 MB. [3] {display_name}_hwc_debug0.dump - {display_name}_hwc_debug9.dump: contain the debug dumps when there are some failures in HWC (e.g. failures in validateDisplay() or presentDisplay()). HWC will only limit up to first 10 debug dumps per display to be saved in separated files. Bug: 230361290 Test: adb bugreport Change-Id: If2158a326faef96c0e0cd4e93a17ec420409bf1e --- dumpstate/DumpstateDevice.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index a03ad1c9..ca992bac 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -963,6 +963,14 @@ void DumpstateDevice::dumpDisplaySection(int fd) { CommandOptions::WithTimeout(2).Build()); DumpFileToFd(fd, "Primary panel extra info", "/sys/devices/platform/exynos-drm/primary-panel/panel_extinfo"); DumpFileToFd(fd, "secondary panel extra info", "/sys/devices/platform/exynos-drm/secondary-panel/panel_extinfo"); + if (!PropertiesHelper::IsUserBuild()) { + DumpFileToFd(fd, "HWC Fence State", "/data/vendor/log/hwc/hwc_fence_state.txt"); + DumpFileToFd(fd, "HWC Error Log", "/data/vendor/log/hwc/hwc_error_log.txt"); + RunCommandToFd(fd, "HWC Debug Dumps", {"/vendor/bin/sh", "-c", + "for f in $(ls /data/vendor/log/hwc/*_hwc_debug*.dump); do " + "echo $f ; cat $f ; done"}, + CommandOptions::WithTimeout(2).Build()); + } } // Dump items related to AoC From 8a3c21e52158de26c1d675cf200bb02b15ee9b5c Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Fri, 26 Aug 2022 10:01:34 +0800 Subject: [PATCH 2/2] remove redundant xml settings Bug: 242661555 Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test Change-Id: I48765a4abdb772bb8a9f458fea59a86df4b2fa41 --- device.mk | 3 +- device_framework_matrix_product.xml | 33 --------------------- manifest.xml | 45 ----------------------------- manifest_64.xml | 36 ----------------------- 4 files changed, 1 insertion(+), 116 deletions(-) diff --git a/device.mk b/device.mk index b1bdfc8a..c7fa7a0c 100644 --- a/device.mk +++ b/device.mk @@ -46,7 +46,6 @@ PRODUCT_SOONG_NAMESPACES += \ device/google/gs101 \ device/google/gs101/powerstats \ vendor/google/whitechapel/tools \ - vendor/broadcom/bluetooth \ vendor/google/camera \ vendor/google/interfaces \ vendor/google_devices/common/proprietary/confirmatioui_hal \ @@ -1181,7 +1180,7 @@ 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/gs101/device_framework_matrix_product.xml +DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product.xml # Preopt SystemUI PRODUCT_DEXPREOPT_SPEED_APPS += SystemUIGoogle # For internal diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 158951a4..d82a0f86 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -86,39 +86,6 @@ default - - hardware.google.bluetooth.bt_channel_avoidance - 1.0 - - IBTChannelAvoidance - default - - - - hardware.google.bluetooth.sar - 1.1 - - IBluetoothSar - default - - - - hardware.google.bluetooth.ext - 1.0 - - IBluetoothExt - default - - - - hardware.google.bluetooth.ccc - hwbinder - 1.1 - - IBluetoothCcc - default - - hardware.qorvo.uwb 2 diff --git a/manifest.xml b/manifest.xml index a306c704..3e946ad3 100644 --- a/manifest.xml +++ b/manifest.xml @@ -66,15 +66,6 @@ default - - android.hardware.bluetooth - hwbinder - 1.1 - - IBluetoothHci - default - - android.hardware.boot hwbinder @@ -97,42 +88,6 @@ default - - hardware.google.bluetooth.bt_channel_avoidance - hwbinder - 1.0 - - IBTChannelAvoidance - default - - - - hardware.google.bluetooth.ext - hwbinder - 1.0 - - IBluetoothExt - default - - - - hardware.google.bluetooth.sar - hwbinder - 1.1 - - IBluetoothSar - default - - - - hardware.google.bluetooth.ccc - hwbinder - 1.1 - - IBluetoothCcc - default - - vendor.google.google_battery 1 diff --git a/manifest_64.xml b/manifest_64.xml index a8b512be..748d6653 100644 --- a/manifest_64.xml +++ b/manifest_64.xml @@ -53,15 +53,6 @@ default - - android.hardware.bluetooth - hwbinder - 1.1 - - IBluetoothHci - default - - android.hardware.bluetooth.audio hwbinder @@ -98,33 +89,6 @@ default - - hardware.google.bluetooth.bt_channel_avoidance - hwbinder - 1.0 - - IBTChannelAvoidance - default - - - - hardware.google.bluetooth.sar - hwbinder - 1.1 - - IBluetoothSar - default - - - - hardware.google.bluetooth.ccc - hwbinder - 1.1 - - IBluetoothCcc - default - - vendor.google.google_battery 1