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

Commit 7264b4e7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Replace checkNetworkStackPermission in TestNetworkService" am: e9baf825 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5dd6577a57be2234014527e3bd517b60c4fecb48
parents b6c5e099 e9baf825

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -32,7 +32,6 @@ 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;
@@ -50,6 +49,7 @@ 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 com.android.net.module.util.NetdUtils;

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

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

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





import java.io.UncheckedIOException;

import java.io.UncheckedIOException;

import java.net.Inet4Address;

import java.net.Inet4Address;
@@ -320,7 +320,7 @@ class TestNetworkService extends ITestNetworkManager.Stub { 
        try {

        try {

            final long token = Binder.clearCallingIdentity();

            final long token = Binder.clearCallingIdentity();

            try {

            try {

                NetworkStack.checkNetworkStackPermission(mContext);

                PermissionUtils.enforceNetworkStackPermission(mContext);

                NetdUtils.setInterfaceUp(mNetd, iface);

                NetdUtils.setInterfaceUp(mNetd, iface);

            } finally {

            } finally {

                Binder.restoreCallingIdentity(token);

                Binder.restoreCallingIdentity(token);