From c3dc56d73a751d63ddaeaf97849c62d89213308e Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Mon, 13 Feb 2023 12:56:28 -0800 Subject: [PATCH 1/4] Remove deprecated f2fsstat Change-Id: I2c1c85875d56bc05915710621a0c5b33a7447c51 Signed-off-by: Jaegeuk Kim --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 9c326773..84c90b46 100644 --- a/device.mk +++ b/device.mk @@ -570,7 +570,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES_DEBUG += \ f2fs_io \ check_f2fs \ - f2fsstat \ f2fs.fibmap \ dump.f2fs From 38a132ae242c6e9755c7e65d5db159ac6c20b1a0 Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan Date: Sat, 11 Feb 2023 09:49:45 +0000 Subject: [PATCH 2/4] Usb: Set connected status when connected to non compliant port partners Set mode, power role and data role when connected to non compliant port partners. Bug: 268584498 Change-Id: I6c3e7df09a61e26f3b976a86bd65cb646edd653d Signed-off-by: Badhri Jagan Sridharan --- usb/usb/Usb.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index f69dca53..74f6868c 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -312,6 +312,12 @@ Status queryNonCompliantChargerStatus(std::vector *currentPortStatus continue; } } + if ((*currentPortStatus)[i].complianceWarnings.size() > 0) { + (*currentPortStatus)[i].currentMode = PortMode::UFP; + (*currentPortStatus)[i].currentPowerRole = PortPowerRole::SINK; + (*currentPortStatus)[i].currentDataRole = PortDataRole::NONE; + (*currentPortStatus)[i].powerBrickStatus = PowerBrickStatus::CONNECTED; + } } } return Status::SUCCESS; From 1f747d3b756f30b45d8c2c3d36534bda49ac3467 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 14 Feb 2023 11:30:37 +0800 Subject: [PATCH 3/4] Move memory dump to gs-common Bug: 240530709 Test: adb bugreport Change-Id: I3ee10b08e4218f2e7cda7f741936bc647818c447 --- dumpstate/Dumpstate.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index a77cc323..229ea214 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -517,18 +517,6 @@ void Dumpstate::dumpDevfreqSection(int fd) { // Dump items related to memory void Dumpstate::dumpMemorySection(int fd) { - RunCommandToFd(fd, "ION HEAPS", {"/vendor/bin/sh", "-c", - "for d in $(ls -d /d/ion/*); do " - "if [ -f $d ]; then " - "echo --- $d; cat $d; " - "else " - "for f in $(ls $d); do " - "echo --- $d/$f; cat $d/$f; " - "done; " - "fi; " - "done"}); - DumpFileToFd(fd, "dmabuf info", "/d/dma_buf/bufinfo"); - DumpFileToFd(fd, "Page Pinner - longterm pin", "/sys/kernel/debug/page_pinner/buffer"); RunCommandToFd(fd, "Pixel CMA stat", {"/vendor/bin/sh", "-c", "for d in $(ls -d /sys/kernel/pixel_stat/mm/cma/*); do " "if [ -f $d ]; then " From db54aa1217d1dce08707b58c08fbdcffaaf7004f Mon Sep 17 00:00:00 2001 From: Xiang Wang Date: Thu, 19 Jan 2023 10:50:51 -0800 Subject: [PATCH 4/4] Update USB HAL clients to use Thermal stable AIDL Bug: b/264594715 Test: boot test Change-Id: I0d633a83224d928c888e53e54b375fcd5c3d4010 --- usb/usb/Android.bp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp index 7d42a76b..b316f355 100644 --- a/usb/usb/Android.bp +++ b/usb/usb/Android.bp @@ -42,6 +42,7 @@ cc_binary { "libhardware", "android.hardware.thermal@1.0", "android.hardware.thermal@2.0", + "android.hardware.thermal-V1-ndk", "android.hardware.usb.gadget@1.0", "android.hardware.usb-V2-ndk", "libcutils", @@ -53,6 +54,7 @@ cc_binary { static_libs: [ "libpixelusb", "libpixelstats", + "libpixelthermalwrapper", ], export_shared_lib_headers: [ "android.frameworks.stats-V1-ndk",