commit eb8fe81d5de625dd6040cd9355e78807930b0a7f
author Maciej Żenczykowski <maze@google.com> Thu Jul 21 07:53:22 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 21 07:53:22 2022 +0000
tree d25aae0644f62fb3177ea0460cfd48a029d8a62a
parent 2c3ac5f9dcfb36e65690691e259894ffe754b533
parent 89309b0be16c512e702c7cab26acee065d59dcc4

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

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

Change-Id: Id5b4a5a3861417d113dc02570b7aec1855892e94
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);
 }