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

Commit 8867f686 authored by Manish Singh's avatar Manish Singh
Browse files

Hide VPNs from users that are hidden 

Bug: 342562186
Test: manual
Change-Id: I288ac0a0eef48d4a94191de2292d02a0f93310aa
parent fd0dd5df

src/com/android/settings/vpn2/VpnSettings.java

+12 −1
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ import com.android.internal.net.LegacyVpnInfo; 
import com.android.internal.net.VpnConfig;

import com.android.internal.net.VpnProfile;

import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.dashboard.RestrictedDashboardFragment;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.widget.GearPreference;
@@ -592,6 +593,9 @@ public class VpnSettings extends RestrictedDashboardFragment implements 
        // Mark connected third-party services

        Set<AppVpnInfo> connections = new ArraySet<>();

        for (UserHandle profile : mUserManager.getUserProfiles()) {

            if (Utils.shouldHideUser(profile, mUserManager)) {

                continue;

            }

            VpnConfig config = mVpnManager.getVpnConfig(profile.getIdentifier());

            if (config != null && !config.legacy) {

                connections.add(new AppVpnInfo(profile.getIdentifier(), config.user));
@@ -604,6 +608,9 @@ public class VpnSettings extends RestrictedDashboardFragment implements 
    private Set<AppVpnInfo> getAlwaysOnAppVpnInfos() {

        Set<AppVpnInfo> result = new ArraySet<>();

        for (UserHandle profile : mUserManager.getUserProfiles()) {

            if (Utils.shouldHideUser(profile, mUserManager)) {

                continue;

            }

            final int profileId = profile.getIdentifier();

            final String packageName = mVpnManager.getAlwaysOnVpnPackageForUser(profileId);

            if (packageName != null) {
@@ -627,7 +634,11 @@ public class VpnSettings extends RestrictedDashboardFragment implements 
        final Set<Integer> profileIds;

        if (includeProfiles) {

            profileIds = new ArraySet<>();

            for (UserHandle profile : UserManager.get(context).getUserProfiles()) {

            UserManager userManager = UserManager.get(context);

            for (UserHandle profile : userManager.getUserProfiles()) {

                if (Utils.shouldHideUser(profile, userManager)) {

                    continue;

                }

                profileIds.add(profile.getIdentifier());

            }

        } else {