Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17896e43 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Use function inside NetdUtils instead of NetworkManagementService" am:... 

Merge "Use function inside NetdUtils instead of NetworkManagementService" am: 30a0fe39 am: ac2004ef am: bffb479a am: 6015bf96

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94e4c5bc35311d3d4aa1e4f8f295b0d5b66f13ea
parents 9afa1eb9 6015bf96

packages/Connectivity/service/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ java_library { 
    static_libs: [

        "net-utils-device-common",

        "net-utils-framework-common",

        "netd-client",

    ],

    apex_available: [

        "//apex_available:platform",

services/core/java/com/android/server/TestNetworkService.java

+4 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.net.NetworkAgent; 
import android.net.NetworkAgentConfig;

import android.net.NetworkCapabilities;

import android.net.NetworkProvider;

import android.net.NetworkStack;

import android.net.RouteInfo;

import android.net.StringNetworkSpecifier;

import android.net.TestNetworkInterface;
@@ -48,6 +49,7 @@ import android.util.SparseArray; 


import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.net.module.util.NetdUtils;



import java.io.UncheckedIOException;

import java.net.Inet4Address;
@@ -317,10 +319,10 @@ class TestNetworkService extends ITestNetworkManager.Stub { 
        }



        try {

            // This requires NETWORK_STACK privileges.

            final long token = Binder.clearCallingIdentity();

            try {

                mNMS.setInterfaceUp(iface);

                NetworkStack.checkNetworkStackPermission(mContext);

                NetdUtils.setInterfaceUp(mNetd, iface);

            } finally {

                Binder.restoreCallingIdentity(token);

            }