commit f2e63bd77990c85ec82fb52a94af88243b3df6a7
author Maciej Żenczykowski <maze@google.com> Thu Jul 21 07:55:38 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 21 07:55:38 2022 +0000
tree 20879982b0ccc4f5de4426fd350b78405304ed1b
parent ee9c586f93891c8ed82a0f1f1a42d8fa1a0761f8
parent b68759814ba37d8c21c92f79bcc54167caaaf62a

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

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

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