diff options
| author | 2023-12-18 03:22:33 +0000 | |
|---|---|---|
| committer | 2023-12-18 03:22:33 +0000 | |
| commit | 7ca7a5925c1111ab3c09d323447768923a2cc35f (patch) | |
| tree | 7ca5f6c7e1738f3b311be62119254233e6035a21 | |
| parent | 2a96cb5a7a7b98d6487e253618a466cbca7a44a0 (diff) | |
| parent | 0ae7fbc36c726b1d6be6ace1917c14f472ba13d4 (diff) | |
Merge "Remove unused ConnectivityManager object" into main am: 0ae7fbc36c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2875555
Change-Id: I7a0346dffbacaeba29362b0b4902e64e8aa29da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/VpnManagerService.java | 4 |
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); |