diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-01-14 19:03:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-01-14 19:03:43 +0000 |
| commit | bfc384fd4fb964d675a99c49a2f8c3b2cbc798d9 (patch) | |
| tree | bb3187b288b5b5ef40d47c726fdc0c89e23876b1 /service/java/com/android/server/wifi/WifiConfigManager.java | |
| parent | 1d0559c7178f1fe2c8f7e66546098369a55e5906 (diff) | |
| parent | 3f230925f7f0ba523702fba56a90b0acb4651041 (diff) | |
| download | android_frameworks_opt_net_wifi-bfc384fd4fb964d675a99c49a2f8c3b2cbc798d9.tar.gz android_frameworks_opt_net_wifi-bfc384fd4fb964d675a99c49a2f8c3b2cbc798d9.tar.bz2 android_frameworks_opt_net_wifi-bfc384fd4fb964d675a99c49a2f8c3b2cbc798d9.zip | |
Merge "WifiConfigManager: Allow setupwizard to modify proxy settings"
Diffstat (limited to 'service/java/com/android/server/wifi/WifiConfigManager.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index 7a0580804..8f3a6b3dc 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -3140,13 +3140,17 @@ public class WifiConfigManager { DeviceAdminInfo.USES_POLICY_DEVICE_OWNER); final boolean hasNetworkSettingsPermission = mWifiPermissionsUtil.checkNetworkSettingsPermission(uid); + final boolean hasNetworkSetupWizardPermission = + mWifiPermissionsUtil.checkNetworkSetupWizardPermission(uid); // If |uid| corresponds to the device owner, allow all modifications. - if (isUidDeviceOwner || isUidProfileOwner || hasNetworkSettingsPermission) { + if (isUidDeviceOwner || isUidProfileOwner || hasNetworkSettingsPermission + || hasNetworkSetupWizardPermission) { return true; } if (mVerboseLoggingEnabled) { Log.v(TAG, "UID: " + uid + " cannot modify WifiConfiguration proxy settings." - + " ConfigOverride=" + hasNetworkSettingsPermission + + " hasNetworkSettings=" + hasNetworkSettingsPermission + + " hasNetworkSetupWizard=" + hasNetworkSetupWizardPermission + " DeviceOwner=" + isUidDeviceOwner + " ProfileOwner=" + isUidProfileOwner); } |