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

Commit ed2ba5d6 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Switch SystemUI from IConnectivityManager to VpnManager." am:... 

Merge "Switch SystemUI from IConnectivityManager to VpnManager." am: 0b303f2d am: c30b637f am: ac36f9b6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e9a80b661c8614ae20fbba7cbf35d809b4b465e
parents dea82b1f ac36f9b6

packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java

+13 −21
Original line number Diff line number Diff line
@@ -31,12 +31,11 @@ import android.content.pm.UserInfo; 
import android.graphics.drawable.Drawable;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager.NetworkCallback;

import android.net.IConnectivityManager;

import android.net.Network;

import android.net.NetworkRequest;

import android.net.VpnManager;

import android.os.Handler;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.UserHandle;

import android.os.UserManager;

import android.security.KeyChain;
@@ -84,7 +83,7 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi 


    private final Context mContext;

    private final ConnectivityManager mConnectivityManager;

    private final IConnectivityManager mConnectivityManagerService;

    private final VpnManager mVpnManager;

    private final DevicePolicyManager mDevicePolicyManager;

    private final PackageManager mPackageManager;

    private final UserManager mUserManager;
@@ -116,8 +115,7 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi 
                context.getSystemService(Context.DEVICE_POLICY_SERVICE);

        mConnectivityManager = (ConnectivityManager)

                context.getSystemService(Context.CONNECTIVITY_SERVICE);

        mConnectivityManagerService = IConnectivityManager.Stub.asInterface(

                ServiceManager.getService(Context.CONNECTIVITY_SERVICE));

        mVpnManager = context.getSystemService(VpnManager.class);

        mPackageManager = context.getPackageManager();

        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);

        mBgExecutor = bgExecutor;
@@ -399,26 +397,20 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi 
    private void updateState() {

        // Find all users with an active VPN

        SparseArray<VpnConfig> vpns = new SparseArray<>();

        try {

        for (UserInfo user : mUserManager.getUsers()) {

                VpnConfig cfg = mConnectivityManagerService.getVpnConfig(user.id);

            VpnConfig cfg = mVpnManager.getVpnConfig(user.id);

            if (cfg == null) {

                continue;

            } else if (cfg.legacy) {

                // Legacy VPNs should do nothing if the network is disconnected. Third-party

                // VPN warnings need to continue as traffic can still go to the app.

                    LegacyVpnInfo legacyVpn = mConnectivityManagerService.getLegacyVpnInfo(user.id);

                LegacyVpnInfo legacyVpn = mVpnManager.getLegacyVpnInfo(user.id);

                if (legacyVpn == null || legacyVpn.state != LegacyVpnInfo.STATE_CONNECTED) {

                    continue;

                }

            }

            vpns.put(user.id, cfg);

        }

        } catch (RemoteException rme) {

            // Roll back to previous state

            Log.e(TAG, "Unable to list active VPNs", rme);

            return;

        }

        mCurrentVpns = vpns;

    }