commit 1f6ae620e3d6180d079c31e83f6ac41a5d1a0448
author Maciej Żenczykowski <maze@google.com> Thu Jul 21 08:44:49 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 21 08:44:49 2022 +0000
tree d25aae0644f62fb3177ea0460cfd48a029d8a62a
parent fcbffa2b4e0e9bad392c52893c224b2ec3b04532
parent 339aedeaf591d84cc96ee384a512bb412abc4c87

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

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

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