Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "remove mPreferentialNetworkServiceEnabled"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-06-24 09:31:15 +00:00
committed by Android (Google) Code Review
parent 85965cf048 ff3e984aa4
commit f0df6d9776
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java
View File

@@ -315,8 +315,6 @@ class ActiveAdmin {
public String mOrganizationId;
public String mEnrollmentSpecificId;
public boolean mAdminCanGrantSensorsPermissions;
public boolean mPreferentialNetworkServiceEnabled =
DevicePolicyManager.PREFERENTIAL_NETWORK_SERVICE_ENABLED_DEFAULT;
public List<PreferentialNetworkServiceConfig> mPreferentialNetworkServiceConfigs =
List.of(PreferentialNetworkServiceConfig.DEFAULT);
@@ -848,15 +846,15 @@ class ActiveAdmin {
} else if (TAG_ALWAYS_ON_VPN_LOCKDOWN.equals(tag)) {
mAlwaysOnVpnLockdown = parser.getAttributeBoolean(null, ATTR_VALUE, false);
} else if (TAG_PREFERENTIAL_NETWORK_SERVICE_ENABLED.equals(tag)) {
mPreferentialNetworkServiceEnabled = parser.getAttributeBoolean(null, ATTR_VALUE,
boolean preferentialNetworkServiceEnabled = parser.getAttributeBoolean(null,
ATTR_VALUE,
DevicePolicyManager.PREFERENTIAL_NETWORK_SERVICE_ENABLED_DEFAULT);
if (mPreferentialNetworkServiceEnabled) {
if (preferentialNetworkServiceEnabled) {
PreferentialNetworkServiceConfig.Builder configBuilder =
new PreferentialNetworkServiceConfig.Builder();
configBuilder.setEnabled(mPreferentialNetworkServiceEnabled);
configBuilder.setEnabled(preferentialNetworkServiceEnabled);
configBuilder.setNetworkId(NET_ENTERPRISE_ID_1);
mPreferentialNetworkServiceConfigs = List.of(configBuilder.build());
mPreferentialNetworkServiceEnabled = false;
}
} else if (TAG_COMMON_CRITERIA_MODE.equals(tag)) {
mCommonCriteriaMode = parser.getAttributeBoolean(null, ATTR_VALUE, false);
@@ -1274,9 +1272,6 @@ class ActiveAdmin {
pw.print("mAlwaysOnVpnLockdown=");
pw.println(mAlwaysOnVpnLockdown);
pw.print("mPreferentialNetworkServiceEnabled=");
pw.println(mPreferentialNetworkServiceEnabled);
pw.print("mCommonCriteriaMode=");
pw.println(mCommonCriteriaMode);