diff options
| author | Jason Monk <jmonk@google.com> | 2013-10-21 12:43:53 -0400 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2013-10-21 18:36:19 -0700 |
| commit | 93edeb9e6cb963683a94bbd2ce198d480361ffb1 (patch) | |
| tree | bf807741dc5b7e1e0f48e55710b62b97030ee797 | |
| parent | 195af0637525fa33365f0d980c0384b65995f110 (diff) | |
| download | base-93edeb9e6cb963683a94bbd2ce198d480361ffb1.tar.gz | |
Make setting PAC require CONNECTIVITY_INTERNAL
Also disables all setting of PAC networks through the internal AsyncChannel
methods. PAC can only be saved through addOrUpdateNetwork for permission
checks.
Bug: 11316946
Change-Id: I51016b578080c342a5e5d536ea9a3fdd4fe16644
| -rw-r--r-- | services/java/com/android/server/wifi/WifiService.java | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/services/java/com/android/server/wifi/WifiService.java b/services/java/com/android/server/wifi/WifiService.java index 86c68f31a00c..d471b5708eae 100644 --- a/services/java/com/android/server/wifi/WifiService.java +++ b/services/java/com/android/server/wifi/WifiService.java @@ -35,6 +35,7 @@ import android.net.wifi.ScanResult; import android.net.wifi.BatchedScanResult; import android.net.wifi.BatchedScanSettings; import android.net.wifi.WifiConfiguration; +import android.net.wifi.WifiConfiguration.ProxySettings; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.net.wifi.WifiStateMachine; @@ -175,8 +176,19 @@ public final class WifiService extends IWifiManager.Stub { WifiConfiguration config = (WifiConfiguration) msg.obj; int networkId = msg.arg1; if (config != null && config.isValid()) { - if (DBG) Slog.d(TAG, "Connect with config" + config); - mWifiStateMachine.sendMessage(Message.obtain(msg)); + // This is restricted because there is no UI for the user to + // monitor/control PAC. + if (config.proxySettings != ProxySettings.PAC) { + if (DBG) Slog.d(TAG, "Connect with config" + config); + mWifiStateMachine.sendMessage(Message.obtain(msg)); + } else { + Slog.e(TAG, "ClientHandler.handleMessage cannot process msg with PAC"); + if (msg.what == WifiManager.CONNECT_NETWORK) { + replyFailed(msg, WifiManager.CONNECT_NETWORK_FAILED); + } else { + replyFailed(msg, WifiManager.SAVE_NETWORK_FAILED); + } + } } else if (config == null && networkId != WifiConfiguration.INVALID_NETWORK_ID) { if (DBG) Slog.d(TAG, "Connect with networkId" + networkId); @@ -685,6 +697,9 @@ public final class WifiService extends IWifiManager.Stub { */ public int addOrUpdateNetwork(WifiConfiguration config) { enforceChangePermission(); + if (config.proxySettings == ProxySettings.PAC) { + enforceConnectivityInternalPermission(); + } if (config.isValid()) { if (mWifiStateMachineChannel != null) { return mWifiStateMachine.syncAddOrUpdateNetwork(mWifiStateMachineChannel, config); |