Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3bf44f5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove extra `0x` in raw USB descriptor dump." into main

parents 3cbe2c8b ea1d6614

services/usb/java/com/android/server/usb/UsbHostManager.java

+2 −6
Original line number Diff line number Diff line
@@ -221,9 +221,7 @@ public class UsbHostManager { 
                for (int line = 0; line < length / kDumpBytesPerLine; line++) {

                    StringBuilder sb = new StringBuilder();

                    for (int offset = 0; offset < kDumpBytesPerLine; offset++) {

                        sb.append("0x")

                            .append(String.format("0x%02X", mDescriptors[dataOffset++]))

                            .append(" ");

                        sb.append(String.format("0x%02X", mDescriptors[dataOffset++])).append(" ");

                    }

                    pw.println(sb.toString());

                }
@@ -231,9 +229,7 @@ public class UsbHostManager { 
                // remainder

                StringBuilder sb = new StringBuilder();

                while (dataOffset < length) {

                    sb.append("0x")

                        .append(String.format("0x%02X", mDescriptors[dataOffset++]))

                        .append(" ");

                    sb.append(String.format("0x%02X", mDescriptors[dataOffset++])).append(" ");

                }

                pw.println(sb.toString());

            } else {