commit 0ec57483ec1b049c62ab1a940840a444579789bb
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 24 00:52:12 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 24 00:52:12 2022 +0000
tree f492cdf66bc3518c22fb0d7a1625e7c9b4762846
parent ede2912063dada99b1e5866ec87e0907ee252771
parent 7ded34d8fcb4ed7c188772d6be2392c5041fb4fb

Merge "remove spurious newlines on ALOG lines" am: 7ded34d8fc

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2103524

Change-Id: Ic5aabaa96e6c0d8952a16f68b1170c896341e234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

netd/BpfHandler.cpp

diff --git a/netd/BpfHandler.cpp b/netd/BpfHandler.cpp
index d6f2949..42d0de5 100644
--- a/netd/BpfHandler.cpp
+++ b/netd/BpfHandler.cpp
@@ -234,7 +234,7 @@
     if (sock_cookie == NONEXISTENT_COOKIE) return -errno;
     base::Result<void> res = mCookieTagMap.deleteValue(sock_cookie);
     if (!res.ok()) {
-        ALOGE("Failed to untag socket: %s\n", strerror(res.error().code()));
+        ALOGE("Failed to untag socket: %s", strerror(res.error().code()));
         return -res.error().code();
     }
     return 0;

service/native/TrafficControllerTest.cpp

diff --git a/service/native/TrafficControllerTest.cpp b/service/native/TrafficControllerTest.cpp
index ad53cb8..3f13532 100644
--- a/service/native/TrafficControllerTest.cpp
+++ b/service/native/TrafficControllerTest.cpp
@@ -685,7 +685,7 @@
                 if (res.ok() || (res.error().code() == ENOENT)) {
                     return Result<void>();
                 }
-                ALOGE("Failed to delete data(cookie = %" PRIu64 "): %s\n", key,
+                ALOGE("Failed to delete data(cookie = %" PRIu64 "): %s", key,
                       strerror(res.error().code()));
             }
             // Move forward to next cookie in the map.