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

Commit 8cdbf889 authored by paulhu's avatar paulhu Committed by Automerger Merge Worker
Browse files

Remove unused NetworkPolicyManagerInternal in CS am: 279b3381 am: f994ab19 

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

Change-Id: I8e19008eb864b2cafc1725e96b85c51372913c22
parents abfe20b1 f994ab19

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

+0 −5
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ import com.android.server.connectivity.PermissionMonitor; 
import com.android.server.connectivity.ProfileNetworkPreferences;

import com.android.server.connectivity.ProxyTracker;

import com.android.server.connectivity.QosCallbackTracker;

import com.android.server.net.NetworkPolicyManagerInternal;



import libcore.io.IoUtils;
@@ -351,7 +350,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    protected INetd mNetd;

    private NetworkStatsManager mStatsManager;

    private NetworkPolicyManager mPolicyManager;

    private NetworkPolicyManagerInternal mPolicyManagerInternal;

    private final NetdCallback mNetdCallback;



    /**
@@ -1238,9 +1236,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 


        mStatsManager = mContext.getSystemService(NetworkStatsManager.class);

        mPolicyManager = mContext.getSystemService(NetworkPolicyManager.class);

        mPolicyManagerInternal = Objects.requireNonNull(

                LocalServices.getService(NetworkPolicyManagerInternal.class),

                "missing NetworkPolicyManagerInternal");

        mDnsResolver = Objects.requireNonNull(dnsresolver, "missing IDnsResolver");

        mProxyTracker = mDeps.makeProxyTracker(mContext, mHandler);

tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt

+0 −6
Original line number Diff line number Diff line
@@ -44,12 +44,10 @@ import android.util.Log 
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.ConnectivityService

import com.android.server.LocalServices

import com.android.server.NetworkAgentWrapper

import com.android.server.TestNetIdManager

import com.android.server.connectivity.MockableSystemProperties

import com.android.server.connectivity.ProxyTracker

import com.android.server.net.NetworkPolicyManagerInternal

import com.android.testutils.TestableNetworkCallback

import org.junit.After

import org.junit.Before
@@ -162,10 +160,6 @@ class ConnectivityServiceIntegrationTest { 
        networkStackClient.init()

        networkStackClient.start()



        LocalServices.removeServiceForTest(NetworkPolicyManagerInternal::class.java)

        LocalServices.addService(NetworkPolicyManagerInternal::class.java,

                mock(NetworkPolicyManagerInternal::class.java))



        service = TestConnectivityService(makeDependencies())

        cm = ConnectivityManager(context, service)

        context.addMockSystemService(Context.CONNECTIVITY_SERVICE, cm)

tests/net/java/com/android/server/ConnectivityServiceTest.java

+0 −4
Original line number Diff line number Diff line
@@ -292,7 +292,6 @@ import com.android.server.connectivity.QosCallbackTracker; 
import com.android.server.connectivity.Vpn;

import com.android.server.connectivity.VpnProfileStore;

import com.android.server.net.NetworkPinner;

import com.android.server.net.NetworkPolicyManagerInternal;

import com.android.testutils.ExceptionUtils;

import com.android.testutils.HandlerUtils;

import com.android.testutils.RecorderCallback.CallbackEntry;
@@ -1501,9 +1500,6 @@ public class ConnectivityServiceTest { 
        mServiceContext = new MockContext(InstrumentationRegistry.getContext(),

                new FakeSettingsProvider());

        mServiceContext.setUseRegisteredHandlers(true);

        LocalServices.removeServiceForTest(NetworkPolicyManagerInternal.class);

        LocalServices.addService(

                NetworkPolicyManagerInternal.class, mock(NetworkPolicyManagerInternal.class));















        mAlarmManagerThread = new HandlerThread("TestAlarmManager");















        mAlarmManagerThread.start();