drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make setting PAC require CONNECTIVITY_INTERNAL" into klp-dev

Browse Source
This commit is contained in:
Jason Monk
2013-10-21 21:40:17 +00:00
committed by Android (Google) Code Review
parent 1bab99c8ce 1aeaf84a38
commit 0aeca87233
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/java/com/android/server/wifi/WifiService.java
View File

@ -35,6 +35,7 @@ import android.net.wifi.ScanResult;
import android.net.wifi.BatchedScanResult; import android.net.wifi.BatchedScanResult;
import android.net.wifi.BatchedScanSettings; import android.net.wifi.BatchedScanSettings;
import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiConfiguration.ProxySettings;
import android.net.wifi.WifiInfo; import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.net.wifi.WifiStateMachine; import android.net.wifi.WifiStateMachine;
@ -175,8 +176,19 @@ public final class WifiService extends IWifiManager.Stub {
WifiConfiguration config = (WifiConfiguration) msg.obj; WifiConfiguration config = (WifiConfiguration) msg.obj;
int networkId = msg.arg1; int networkId = msg.arg1;
if (config != null && config.isValid()) { if (config != null && config.isValid()) {
if (DBG) Slog.d(TAG, "Connect with config" + config); // This is restricted because there is no UI for the user to
mWifiStateMachine.sendMessage(Message.obtain(msg)); // 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 } else if (config == null
&& networkId != WifiConfiguration.INVALID_NETWORK_ID) { && networkId != WifiConfiguration.INVALID_NETWORK_ID) {
if (DBG) Slog.d(TAG, "Connect with networkId" + networkId); 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) { public int addOrUpdateNetwork(WifiConfiguration config) {
enforceChangePermission(); enforceChangePermission();
if (config.proxySettings == ProxySettings.PAC) {
enforceConnectivityInternalPermission();
}
if (config.isValid()) { if (config.isValid()) {
if (mWifiStateMachineChannel != null) { if (mWifiStateMachineChannel != null) {
return mWifiStateMachine.syncAddOrUpdateNetwork(mWifiStateMachineChannel, config); return mWifiStateMachine.syncAddOrUpdateNetwork(mWifiStateMachineChannel, config);