diff options
| author | Antoan Angelov <arangelov@google.com> | 2020-06-24 19:01:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 19:01:21 +0000 |
| commit | e7a6f866725dcab50664608085f8f3e4722ea583 (patch) | |
| tree | 1526dcabb2458d48713fa4f2b4d123d9664f851b /service | |
| parent | 76e281272ba6a261ec5a79b694bd2c9525f814a7 (diff) | |
| parent | 0c1240fbf6e6043f1e59757923ea2a8e079ebae5 (diff) | |
Merge "Allow NETWORK_MANAGED_PROVISIONING to modify proxy settings." into rvc-dev am: 273c4e562d am: 0c1240fbf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/11971138
Change-Id: I5099dea29863a7f56c990ecffcb9d438fdb578a8
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 4 |
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 99de9277e..6d04b7a68 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -3240,9 +3240,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) { |