From 8dfba0e35b584fe4a1a1fad1110168009d4dbef1 Mon Sep 17 00:00:00 2001
From: arangelov <arangelov@google.com>
Date: Tue, 23 Jun 2020 13:40:04 +0100
Subject: Allow NETWORK_MANAGED_PROVISIONING to modify proxy settings.

Bug: 159606385
Test: manual
Test: atest WifiConfigManagerTest
Change-Id: I9bf6c900bf68aa18cb775929a6ac36d3c066cc33
---
 service/java/com/android/server/wifi/WifiConfigManager.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'service')

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) {
-- 
cgit v1.2.3