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

Commit b0dfe1fb authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Switch SystemUI from IConnectivityManager to VpnManager. 

The VPN code is moving out of ConnectivityService to a new
VpnManagerService. Update SystemUI to call into the new service.

Bug: 173331190
Test: manually verified key displayed in status bar when VPN comes up
Change-Id: Id2731a166b5d6783acb1c711a54604b69aa8c0d7
parent 31083c40

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

+13 −21
Original line number Diff line number Diff line
@@ -27,12 +27,11 @@ import android.content.pm.PackageManager.NameNotFoundException; 
import android.content.pm.UserInfo;

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;
@@ -75,7 +74,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;
@@ -107,8 +106,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;
@@ -346,26 +344,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;

    }