commit 89309b0be16c512e702c7cab26acee065d59dcc4
author Maciej Żenczykowski <maze@google.com> Thu Jul 21 07:34:01 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 21 07:34:01 2022 +0000
tree 456e8c5a5d05de813de48a3406827567e1d64821
parent ecfd3d7f67b67eee189481f9294f5c38a4de7f3d
parent a530228ecdc7e8c101656bb4b2b06d4b84ac6582

Merge "TestNetworkService: add missing return statement" am: a530228ecd

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

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

service/jni/com_android_server_TestNetworkService.cpp

diff --git a/service/jni/com_android_server_TestNetworkService.cpp b/service/jni/com_android_server_TestNetworkService.cpp
index 9c7a761..a6efbc6 100644
--- a/service/jni/com_android_server_TestNetworkService.cpp
+++ b/service/jni/com_android_server_TestNetworkService.cpp
@@ -97,6 +97,7 @@
     ScopedUtfChars iface(env, jIface);
     if (!iface.c_str()) {
         jniThrowNullPointerException(env, "iface");
+        return;
     }
     setTunTapCarrierEnabledImpl(env, iface.c_str(), tunFd, enabled);
 }