Merge "Make EthernetPort#toString more legible" into main

service-t/src/com/android/server/ethernet/EthernetPort.java

@@ -70,8 +70,8 @@ public class EthernetPort {
 
     @Override
     public String toString() {
-        return "Interface name: " + mInterfaceName + ", MAC address: " + mMacAddress
-                + ", Interface index: " + mInterfaceIndex;
+        return "EthernetPort(" + mInterfaceName + ", ifindex=" + mInterfaceIndex
+                + ", MAC=" + mMacAddress + ")";
     }
 
     @Override

tests/unit/java/com/android/server/ethernet/EthernetPortTest.java

@@ -115,7 +115,7 @@ public class EthernetPortTest {
     public void testToString() {
         EthernetPort port = new EthernetPort(
                 mTestInterfaceName, mTestMacAddress, mTestInterfaceIndex);
-        String expect = "Interface name: eth0, MAC address: 0a:1b:2c:3d:4e:5f, Interface index: 1";
+        String expect = "EthernetPort(eth0, ifindex=1, MAC=0a:1b:2c:3d:4e:5f)";
         assertEquals(expect, port.toString());
     }
 }