commit 86179beedb76bc5dc8414fea08c63a683b1caac1
author Paul Hu <paulhu@google.com> Fri Apr 14 01:52:57 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 14 01:52:57 2023 +0000
tree b0dd3d74e582845a866d82fcf9d19fd2f750c42d
parent b06f9d6b81b06df96451a4a64f9453e11ac32a08
parent 99fdf930666a56172615bb374ad39cb3d1cca86c

Merge "Add missed NSD event name"

Tethering/Android.bp

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 8810a8c..83ca2b7 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -250,6 +250,9 @@
         // e.g. *classpath_fragments.
         "com.android.tethering",
     ],
+    native_shared_libs: [
+        "libnetd_updatable",
+    ],
 }
 
 java_library_static {

service/jni/com_android_server_connectivity_ClatCoordinator.cpp

diff --git a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
index dfc9ffc..19f2fb8 100644
--- a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
+++ b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
@@ -51,7 +51,7 @@
 
 namespace android {
 
-#define ALOGF(s ...) do { ALOGE(s); } while(0)
+#define ALOGF(s ...) do { ALOGE(s); abort(); } while(0)
 
 enum verify { VERIFY_DIR, VERIFY_BIN, VERIFY_PROG, VERIFY_MAP_RO, VERIFY_MAP_RW };
 
@@ -500,7 +500,9 @@
     if (ret == 0) {
         ALOGE("Failed to SIGTERM clatd pid=%d, try SIGKILL", pid);
         // TODO: fix that kill failed or waitpid doesn't return.
-        kill(pid, SIGKILL);
+        if (kill(pid, SIGKILL)) {
+            ALOGE("Failed to SIGKILL clatd pid=%d: %s", pid, strerror(errno));
+        }
         ret = waitpid(pid, &status, 0);
     }
     if (ret == -1) {