Merge changes Ie826477d,I5125a3ac

* changes: [CLATJ#26] ClatCoordinator: reword clatd starting failure logging [CLATJ#25] ClatCoordinator: stop clatd process gracefully
2022-01-26 14:50:11 +00:00
parent 30f06afda3 6fb21144b8
commit f8ed984e9c
3 changed files with 40 additions and 4 deletions
--- a/tests/unit/java/com/android/server/connectivity/ClatCoordinatorTest.java
+++ b/tests/unit/java/com/android/server/connectivity/ClatCoordinatorTest.java
@@ -340,7 +340,7 @@ public class ClatCoordinatorTest {
        inOrder.verifyNoMoreInteractions();

        // [2] Start clatd again failed.
-        assertThrows("java.io.IOException: Clatd has started on test0 (pid 10483)",
+        assertThrows("java.io.IOException: Clatd is already running on test0 (pid 10483)",
                IOException.class,
                () -> coordinator.clatStart(BASE_IFACE, NETID, NAT64_IP_PREFIX));