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

Refactor the condition order

Browse Source 
Bug: 239984274
Test: atest -c VpnSettingsTest
Change-Id: Ic9e8c775b044fffd5dec5047fb53d75209418d85
This commit is contained in:
Hugh Chen
2022-07-29 02:45:12 +00:00
parent 563e0e0a01
commit 5cf2b7ff1f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -635,11 +635,13 @@ public class VpnSettings extends RestrictedSettingsFragment implements
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());
if (!profileIds.contains(userId) if (!profileIds.contains(userId)) {
|| isAdvancedVpn(featureProvider, pkg.getPackageName(), context)) {
// Skip packages for users outside of our profile group. // Skip packages for users outside of our profile group.
continue; continue;
} }
if (isAdvancedVpn(featureProvider, pkg.getPackageName(), context)) {
continue;
}
// 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()) {