commit bb2fc5a0b500a79f895d3f800445b279904cd17a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Feb 08 03:43:30 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 08 03:43:30 2024 +0000
tree 4be0e1ca6123c2cbb1549d0dc0ab05eb092d655e
parent 68fc74372b036450bcde927f25d95e37113f8851
parent 241046adaa4c68b43060e58df0f0d48267f70893

Merge "fastboot: Remove '\n' from interface name on linux" into main am: 241046adaa

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2955272

Change-Id: I772dfb2fbfadfe48b76f05951e03e648ab2a71fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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());
         }