summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chiachang Wang <chiachangwang@google.com> 2023-12-18 02:57:48 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-12-18 02:57:48 +0000
commit0ae7fbc36c726b1d6be6ace1917c14f472ba13d4 (patch)
tree7ca5f6c7e1738f3b311be62119254233e6035a21
parent5d4b7c17d028f67c5173b7612ebfc118b031b847 (diff)
parent3d19f0a9cedb72506b1fdf8cf5372b4518b26436 (diff)
Merge "Remove unused ConnectivityManager object" into main
-rw-r--r--services/core/java/com/android/server/VpnManagerService.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/VpnManagerService.java b/services/core/java/com/android/server/VpnManagerService.java
index 2ba3a1d751d0..1d1e2d994787 100644
--- a/services/core/java/com/android/server/VpnManagerService.java
+++ b/services/core/java/com/android/server/VpnManagerService.java
@@ -30,7 +30,6 @@ import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.UserInfo;
-import android.net.ConnectivityManager;
import android.net.INetd;
import android.net.IVpnManager;
import android.net.Network;
@@ -89,8 +88,6 @@ public class VpnManagerService extends IVpnManager.Stub {
private final Context mUserAllContext;
private final Dependencies mDeps;
-
- private final ConnectivityManager mCm;
private final VpnProfileStore mVpnProfileStore;
private final INetworkManagementService mNMS;
private final INetd mNetd;
@@ -164,7 +161,6 @@ public class VpnManagerService extends IVpnManager.Stub {
mHandler = mHandlerThread.getThreadHandler();
mVpnProfileStore = mDeps.getVpnProfileStore();
mUserAllContext = mContext.createContextAsUser(UserHandle.ALL, 0 /* flags */);
- mCm = mContext.getSystemService(ConnectivityManager.class);
mNMS = mDeps.getINetworkManagementService();
mNetd = mDeps.getNetd();
mUserManager = mContext.getSystemService(UserManager.class);