commit 4e4d918689e44fa67e0ff0d694899289e9f92092
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Feb 08 16:09:04 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 08 16:09:04 2024 +0000
tree 0998b519710b05f74cd1b8f5e0345745a208f84c
parent 2b2fcaea46eeb93a854670cc28a995c637642644
parent 1c5911fade98c14bdda106f93d81701c9f34cda7

Merge "Remove unused addKernelPanicSubReason() return value." into main

fastboot/usb_linux.cpp

diff --git a/fastboot/usb_linux.cpp b/fastboot/usb_linux.cpp
index b7fd5ed..72e326a 100644
--- a/fastboot/usb_linux.cpp
+++ b/fastboot/usb_linux.cpp
@@ -269,6 +269,9 @@
         auto path = android::base::StringPrintf("/sys/bus/usb/devices/%s/%s:1.%d/interface",
                                                 sysfs_name, sysfs_name, ifc->bInterfaceNumber);
         if (android::base::ReadFileToString(path, &interface)) {
+            if (!interface.empty() && interface.back() == '\n') {
+                interface.pop_back();
+            }
             snprintf(info.interface, sizeof(info.interface), "%s", interface.c_str());
         }
 

healthd/BatteryMonitor.cpp

diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp
index b8bb586..fbdf5fe 100644
--- a/healthd/BatteryMonitor.cpp
+++ b/healthd/BatteryMonitor.cpp
@@ -530,7 +530,7 @@
              props.chargerAcOnline ? "a" : "", props.chargerUsbOnline ? "u" : "",
              props.chargerWirelessOnline ? "w" : "", props.chargerDockOnline ? "d" : "");
 
-    KLOG_WARNING(LOG_TAG, "%s\n", dmesgline);
+    KLOG_DEBUG(LOG_TAG, "%s\n", dmesgline);
 }
 
 void BatteryMonitor::logValues(const HealthInfo_2_1& health_info,