summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorarangelov <arangelov@google.com>2020-06-23 13:40:04 +0100
committerarangelov <arangelov@google.com>2020-06-23 13:54:30 +0100
commit8dfba0e35b584fe4a1a1fad1110168009d4dbef1 (patch)
treef112cb9aaddce2672edabe339674b61c0b131dd0 /service
parentbb47b319352980ed1f65336cece756707ccc7e1b (diff)
Allow NETWORK_MANAGED_PROVISIONING to modify proxy settings.
Bug: 159606385 Test: manual Test: atest WifiConfigManagerTest Change-Id: I9bf6c900bf68aa18cb775929a6ac36d3c066cc33
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/WifiConfigManager.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index 6b88f7165..1529c6560 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -3252,9 +3252,11 @@ public class WifiConfigManager {
mWifiPermissionsUtil.checkNetworkSettingsPermission(uid);
final boolean hasNetworkSetupWizardPermission =
mWifiPermissionsUtil.checkNetworkSetupWizardPermission(uid);
+ final boolean hasNetworkManagedProvisioningPermission =
+ mWifiPermissionsUtil.checkNetworkManagedProvisioningPermission(uid);
// If |uid| corresponds to the device owner, allow all modifications.
if (isProfileOwner || isDeviceOwner || hasNetworkSettingsPermission
- || hasNetworkSetupWizardPermission) {
+ || hasNetworkSetupWizardPermission || hasNetworkManagedProvisioningPermission) {
return true;
}
if (mVerboseLoggingEnabled) {