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

Commit 7ca7a592 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove unused ConnectivityManager object" into main am: 0ae7fbc3 

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



Change-Id: I7a0346dffbacaeba29362b0b4902e64e8aa29da4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2a96cb5a 0ae7fbc3

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

+0 −4
Original line number Original line Diff line number Diff line
@@ -30,7 +30,6 @@ import android.content.IntentFilter; 
import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.UserInfo;

import android.content.pm.UserInfo;

import android.net.ConnectivityManager;

import android.net.INetd;

import android.net.INetd;

import android.net.IVpnManager;

import android.net.IVpnManager;

import android.net.Network;

import android.net.Network;
@@ -89,8 +88,6 @@ public class VpnManagerService extends IVpnManager.Stub { 
    private final Context mUserAllContext;

    private final Context mUserAllContext;





    private final Dependencies mDeps;

    private final Dependencies mDeps;



    private final ConnectivityManager mCm;

    private final VpnProfileStore mVpnProfileStore;

    private final VpnProfileStore mVpnProfileStore;

    private final INetworkManagementService mNMS;

    private final INetworkManagementService mNMS;

    private final INetd mNetd;

    private final INetd mNetd;
@@ -164,7 +161,6 @@ public class VpnManagerService extends IVpnManager.Stub { 
        mHandler = mHandlerThread.getThreadHandler();

        mHandler = mHandlerThread.getThreadHandler();

        mVpnProfileStore = mDeps.getVpnProfileStore();

        mVpnProfileStore = mDeps.getVpnProfileStore();

        mUserAllContext = mContext.createContextAsUser(UserHandle.ALL, 0 /* flags */);

        mUserAllContext = mContext.createContextAsUser(UserHandle.ALL, 0 /* flags */);

        mCm = mContext.getSystemService(ConnectivityManager.class);

        mNMS = mDeps.getINetworkManagementService();

        mNMS = mDeps.getINetworkManagementService();

        mNetd = mDeps.getNetd();

        mNetd = mDeps.getNetd();

        mUserManager = mContext.getSystemService(UserManager.class);

        mUserManager = mContext.getSystemService(UserManager.class);