joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Use function inside NetdUtils instead of NetworkManagementService" am: 8ecb705379

Browse source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534904

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc30a45e691ec76703452595b62b588b78cd8048
This commit is contained in:
Lucas Lin 2021-02-02 04:18:56 +00:00 • committed by Automerger Merge Worker
commit 89dfaaee8d
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
service/Android.bp
View file

@ -57,6 +57,7 @@ java_library {
static_libs: [ static_libs: [
"net-utils-device-common", "net-utils-device-common",
"net-utils-framework-common", "net-utils-framework-common",
"netd-client",
], ],
apex_available: [ apex_available: [
"//apex_available:platform", "//apex_available:platform",

6
services/core/java/com/android/server/TestNetworkService.java
View file

@ -32,6 +32,7 @@ import android.net.NetworkAgent;
import android.net.NetworkAgentConfig; import android.net.NetworkAgentConfig;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkProvider; import android.net.NetworkProvider;
import android.net.NetworkStack;
import android.net.RouteInfo; import android.net.RouteInfo;
import android.net.StringNetworkSpecifier; import android.net.StringNetworkSpecifier;
import android.net.TestNetworkInterface; import android.net.TestNetworkInterface;
@ -48,6 +49,7 @@ import android.util.SparseArray;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.net.module.util.NetdUtils;
import java.io.UncheckedIOException; import java.io.UncheckedIOException;
import java.net.Inet4Address; import java.net.Inet4Address;
@ -317,10 +319,10 @@ class TestNetworkService extends ITestNetworkManager.Stub {
} }
try { try {
// This requires NETWORK_STACK privileges.
final long token = Binder.clearCallingIdentity(); final long token = Binder.clearCallingIdentity();
try { try {
mNMS.setInterfaceUp(iface); NetworkStack.checkNetworkStackPermission(mContext);
NetdUtils.setInterfaceUp(mNetd, iface);
} finally { } finally {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);
} }