diff options
| author | xshu <xshu@google.com> | 2018-12-17 15:29:01 -0800 |
|---|---|---|
| committer | xshu <xshu@google.com> | 2018-12-17 15:31:25 -0800 |
| commit | db73d6cc00fb498ae58662eed3b24ed28d02444a (patch) | |
| tree | a2ea4b700dfa95cd7b941d0b2d57c2809a58c698 /service/java/com/android/server/wifi/WifiConfigManager.java | |
| parent | 66707ce57d953e940c1035114bd1d7d3bf018544 (diff) | |
| download | android_frameworks_opt_net_wifi-db73d6cc00fb498ae58662eed3b24ed28d02444a.tar.gz android_frameworks_opt_net_wifi-db73d6cc00fb498ae58662eed3b24ed28d02444a.tar.bz2 android_frameworks_opt_net_wifi-db73d6cc00fb498ae58662eed3b24ed28d02444a.zip | |
Give SetupWizard permission to set macRandomizationSetting
Bug: 121108389
Test: unit tests
Test: flash new build, try connecting to network with setup wizard
Change-Id: Ie4143c82f1104e2bccb153342c5e04c9f48b6a0e
Diffstat (limited to 'service/java/com/android/server/wifi/WifiConfigManager.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index a145fde47..df27d163c 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -1100,9 +1100,11 @@ public class WifiConfigManager { } if (WifiConfigurationUtil.hasMacRandomizationSettingsChanged(existingInternalConfig, - newInternalConfig) && !mWifiPermissionsUtil.checkNetworkSettingsPermission(uid)) { + newInternalConfig) && !mWifiPermissionsUtil.checkNetworkSettingsPermission(uid) + && !mWifiPermissionsUtil.checkNetworkSetupWizardPermission(uid)) { Log.e(TAG, "UID " + uid + " does not have permission to modify MAC randomization " - + "Settings " + config.configKey() + ". Must have NETWORK_SETTINGS"); + + "Settings " + config.configKey() + ". Must have NETWORK_SETTINGS or" + + "NETWORK_SETUP_WIZARD."); return new NetworkUpdateResult(WifiConfiguration.INVALID_NETWORK_ID); } |