Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix an NPE in WifiService" into klp-dev

Browse Source
This commit is contained in:
Vinit Deshapnde
2013-09-16 20:25:52 +00:00
committed by Android (Google) Code Review
parent 26cb5fd5ff ffec332727
commit 7354b834fc
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,10 +172,16 @@ public final class WifiService extends IWifiManager.Stub {
case WifiManager.CONNECT_NETWORK:
case WifiManager.SAVE_NETWORK: {
WifiConfiguration config = (WifiConfiguration) msg.obj;
if (config.isValid()) {
int networkId = msg.arg1;
if (config != null && config.isValid()) {
if (DBG) Slog.d(TAG, "Connect with config" + config);
mWifiStateMachine.sendMessage(Message.obtain(msg));
} else if (config == null
&& networkId != WifiConfiguration.INVALID_NETWORK_ID) {
if (DBG) Slog.d(TAG, "Connect with networkId" + networkId);
mWifiStateMachine.sendMessage(Message.obtain(msg));
} else {
Slog.d(TAG, "ClientHandler.handleMessage ignoring msg=" + msg);
Slog.e(TAG, "ClientHandler.handleMessage ignoring invalid msg=" + msg);
if (msg.what == WifiManager.CONNECT_NETWORK) {
replyFailed(msg, WifiManager.CONNECT_NETWORK_FAILED);
} else {