diff options
| author | Zhoulu Luo <zluo@codeaurora.org> | 2015-02-18 11:35:00 -0800 |
|---|---|---|
| committer | Anh Nguyen <anguyen@codeaurora.org> | 2015-03-10 06:50:12 -0700 |
| commit | 58047d72401884e11f5bbe2e5149186b04b0d892 (patch) | |
| tree | 4b280bb61fc10cd54b1e5740e6c2d6e1b57349d0 /service | |
| parent | d6459e7bcb9c1e9df6da3fb69346fb07d57655e5 (diff) | |
| download | android_frameworks_opt_net_wifi-58047d72401884e11f5bbe2e5149186b04b0d892.tar.gz android_frameworks_opt_net_wifi-58047d72401884e11f5bbe2e5149186b04b0d892.tar.bz2 android_frameworks_opt_net_wifi-58047d72401884e11f5bbe2e5149186b04b0d892.zip | |
Compilation fix
Change-Id: I261bb890d53e3b0712fd70a199272133d3fe0f0c
Diffstat (limited to 'service')
| -rwxr-xr-x | service/java/com/android/server/wifi/WifiStateMachine.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index fabc85b98..15477138d 100755 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -67,6 +67,7 @@ import android.net.wifi.SupplicantState; import android.net.wifi.WifiChannel; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConnectionStatistics; +import android.net.wifi.WifiEapSimInfo; import android.net.wifi.WifiEnterpriseConfig; import android.net.wifi.WifiInfo; import android.net.wifi.WifiLinkLayerStats; @@ -1722,6 +1723,7 @@ public class WifiStateMachine extends StateMachine { return false; } if (mP2pConnected.get()) { + int scanSource = msg.arg1; if (scanSource == SCAN_ALARM_SOURCE) { if (VDBG) { logd("P2P connected: lastScanDuringP2p=" + @@ -2273,7 +2275,7 @@ public class WifiStateMachine extends StateMachine { * Get sim info synchronously */ - public WifiEapSimInfo syncGetSimInfo(AsyncChannel channel) { + public WifiEapSimInfo syncGetSimInfo(AsyncChannel channel) { Message resultMsg = channel.sendMessageSynchronously(CMD_GET_SIM_INFO); WifiEapSimInfo mWifiEapSimInfo = (WifiEapSimInfo) resultMsg.obj; resultMsg.recycle(); @@ -8092,7 +8094,9 @@ public class WifiStateMachine extends StateMachine { * cleared */ if (!mIsScanOngoing) { - enableBackgroundScan(true); + if (!mWifiNative.enableBackgroundScan(true)) { + handlePnoFailError(); + } } } else { setScanAlarm(true); |