commit a82bee5d642ca072f755a63bfa5468da5c34abb5
author Maciej Żenczykowski <maze@google.com> Tue May 25 00:42:25 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 25 00:42:25 2021 +0000
tree 9d2b137d697be12c72fa431097b5055d7e2f1139
parent ebb497806bb58d85a7d3d4b952d3cf3cb6bdd1bd
parent 705d0a964491e3068675e7e1fbea15be6a6ea259

Merge "Fix memory access violation in NetworkStack" am: fc592e8bc0 am: d417b64774 am: 705d0a9644

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

Change-Id: I3fa37993e3af019b82b96944342bd9fba6f3b0a5

Tethering/jni/com_android_networkstack_tethering_BpfUtils.cpp

diff --git a/Tethering/jni/com_android_networkstack_tethering_BpfUtils.cpp b/Tethering/jni/com_android_networkstack_tethering_BpfUtils.cpp
index 1611f9d..2fb5985 100644
--- a/Tethering/jni/com_android_networkstack_tethering_BpfUtils.cpp
+++ b/Tethering/jni/com_android_networkstack_tethering_BpfUtils.cpp
@@ -183,7 +183,7 @@
             return false;
         default:
             jniThrowExceptionFmt(env, "java/io/IOException",
-                                 "Unknown hardware address type %s on interface %s", rv,
+                                 "Unknown hardware address type %d on interface %s", rv,
                                  interface.c_str());
             return false;
     }