From 279b33817f4a1e892d1db6591be8548dc1e69611 Mon Sep 17 00:00:00 2001 From: paulhu Date: Fri, 19 Mar 2021 14:29:01 +0800 Subject: Remove unused NetworkPolicyManagerInternal in CS ConnectivityService doesn't call any NPMI methods, so remove all usage from CS. Bug: 170598012 Test: atest FrameworksNetTests Test: atest FrameworksNetIntegrationTests Change-Id: I8719ef2e96e7db9da2894b467b9e7a1bc09de386 Merged-In: I8719ef2e96e7db9da2894b467b9e7a1bc09de386 --- services/core/java/com/android/server/ConnectivityService.java | 5 ----- 1 file changed, 5 deletions(-) (limited to 'services') diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index cb7894d2fa63..d254d7eccc33 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -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); -- cgit v1.2.3