Snap for 9607154 from db54aa1217 to udc-release

Change-Id: I70af0d68fc47c75de41a6b62ab28595baf75c245
This commit is contained in:
Android Build Coastguard Worker 2023-02-15 02:03:09 +00:00
commit ed4e6b36a3
4 changed files with 8 additions and 13 deletions

View file

@ -545,7 +545,6 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES_DEBUG += \
f2fs_io \
check_f2fs \
f2fsstat \
f2fs.fibmap \
dump.f2fs

View file

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

View file

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

View file

@ -312,6 +312,12 @@ Status queryNonCompliantChargerStatus(std::vector<PortStatus> *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;