Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 998c7007 authored by Vinit Deshapnde's avatar Vinit Deshapnde Committed by Android Git Automerger
Browse files

am 664b5df7: am 7354b834: Merge "Fix an NPE in WifiService" into klp-dev 

* commit '664b5df7':
  Fix an NPE in WifiService
parents 5454e3dd 664b5df7

services/java/com/android/server/wifi/WifiService.java

+8 −2
Original line number Diff line number Diff line
@@ -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 {