commit a73f1bce061e9c578bf1c79366db3b64b932592f
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Feb 06 18:30:58 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 06 18:30:58 2025 -0800
tree 5d1ddd3beacd9ede0e60e03f3bfb55965b9f1bf6
parent 072d29d4061a53d24cdf522c49ded5256499b2c0
parent 690ec2cbf97fec36264731a3e9227c8136f6b6bb

Merge "virtmgr: remove carriage returns from VM console logcat" into main

android/virtmgr/src/aidl.rs

diff --git a/android/virtmgr/src/aidl.rs b/android/virtmgr/src/aidl.rs
index fc41b12..d15195c 100644
--- a/android/virtmgr/src/aidl.rs
+++ b/android/virtmgr/src/aidl.rs
@@ -2000,9 +2000,13 @@
                 // EOF
                 return;
             }
-            Ok(size) => {
-                if buf[size - 1] == b'\n' {
+            Ok(_size) => {
+                if buf.last() == Some(&b'\n') {
                     buf.pop();
+                    // Logs sent via TTY usually end lines with "\r\n".
+                    if buf.last() == Some(&b'\r') {
+                        buf.pop();
+                    }
                 }
                 info!("{}: {}", &tag, &String::from_utf8_lossy(&buf));
             }