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

Commit bcd6b8cb authored by Benedict Wong's avatar Benedict Wong
Browse files

Add Platform VPNs to VPN list 

This change allows the Settings VPN pages to pull the apps providing a
new Platform VPN.

Bug: 144246835
Test: Compiles, manual testing
Change-Id: Ibb7e79ccde754724c9fc00c88da98e975f325ba7
parent 5c8b2265

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

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.settings.vpn2;



import static android.app.AppOpsManager.OP_ACTIVATE_PLATFORM_VPN;

import static android.app.AppOpsManager.OP_ACTIVATE_VPN;



import android.annotation.NonNull;
@@ -312,7 +313,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment 
        final AppOpsManager service =

                (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);

        final List<AppOpsManager.PackageOps> ops = service.getOpsForPackage(application.uid,

                application.packageName, new int[]{OP_ACTIVATE_VPN});

                application.packageName, new int[]{OP_ACTIVATE_VPN, OP_ACTIVATE_PLATFORM_VPN});

        return !ArrayUtils.isEmpty(ops);

    }

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

+5 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings.vpn2;



import static android.app.AppOpsManager.OP_ACTIVATE_PLATFORM_VPN;

import static android.app.AppOpsManager.OP_ACTIVATE_VPN;



import android.annotation.UiThread;
@@ -522,7 +523,8 @@ public class VpnSettings extends RestrictedSettingsFragment implements 


        // Fetch VPN-enabled apps from AppOps.

        AppOpsManager aom = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);

        List<AppOpsManager.PackageOps> apps = aom.getPackagesForOps(new int[] {OP_ACTIVATE_VPN});

        List<AppOpsManager.PackageOps> apps =

                aom.getPackagesForOps(new int[] {OP_ACTIVATE_VPN, OP_ACTIVATE_PLATFORM_VPN});

        if (apps != null) {

            for (AppOpsManager.PackageOps pkg : apps) {

                int userId = UserHandle.getUserId(pkg.getUid());
@@ -533,8 +535,8 @@ public class VpnSettings extends RestrictedSettingsFragment implements 
                // Look for a MODE_ALLOWED permission to activate VPN.

                boolean allowed = false;

                for (AppOpsManager.OpEntry op : pkg.getOps()) {

                    if (op.getOp() == OP_ACTIVATE_VPN &&

                            op.getMode() == AppOpsManager.MODE_ALLOWED) {

                    if ((op.getOp() == OP_ACTIVATE_VPN || op.getOp() == OP_ACTIVATE_PLATFORM_VPN)

                            && op.getMode() == AppOpsManager.MODE_ALLOWED) {

                        allowed = true;

                    }

                }