PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Platform VPNs to VPN list

Browse Source 
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
This commit is contained in:
Benedict Wong
2020-01-17 18:53:46 -08:00
parent 5c8b22657c
commit bcd6b8cbca
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/vpn2/AppManagementFragment.java
View File

@@ -15,6 +15,7 @@
*/ */
package com.android.settings.vpn2; package com.android.settings.vpn2;
import static android.app.AppOpsManager.OP_ACTIVATE_PLATFORM_VPN;
import static android.app.AppOpsManager.OP_ACTIVATE_VPN; import static android.app.AppOpsManager.OP_ACTIVATE_VPN;
import android.annotation.NonNull; import android.annotation.NonNull;
@@ -312,7 +313,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment
final AppOpsManager service = final AppOpsManager service =
(AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE); (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
final List<AppOpsManager.PackageOps> ops = service.getOpsForPackage(application.uid, 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); return !ArrayUtils.isEmpty(ops);
} }

8
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.vpn2; package com.android.settings.vpn2;
import static android.app.AppOpsManager.OP_ACTIVATE_PLATFORM_VPN;
import static android.app.AppOpsManager.OP_ACTIVATE_VPN; import static android.app.AppOpsManager.OP_ACTIVATE_VPN;
import android.annotation.UiThread; import android.annotation.UiThread;
@@ -522,7 +523,8 @@ public class VpnSettings extends RestrictedSettingsFragment implements
// Fetch VPN-enabled apps from AppOps. // Fetch VPN-enabled apps from AppOps.
AppOpsManager aom = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE); 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) { if (apps != null) {
for (AppOpsManager.PackageOps pkg : apps) { for (AppOpsManager.PackageOps pkg : apps) {
int userId = UserHandle.getUserId(pkg.getUid()); 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. // Look for a MODE_ALLOWED permission to activate VPN.
boolean allowed = false; boolean allowed = false;
for (AppOpsManager.OpEntry op : pkg.getOps()) { for (AppOpsManager.OpEntry op : pkg.getOps()) {
if (op.getOp() == OP_ACTIVATE_VPN && if ((op.getOp() == OP_ACTIVATE_VPN || op.getOp() == OP_ACTIVATE_PLATFORM_VPN)
op.getMode() == AppOpsManager.MODE_ALLOWED) { && op.getMode() == AppOpsManager.MODE_ALLOWED) {
allowed = true; allowed = true;
} }
} }