diff options
| author | Sravanthi Palakonda <srapal@codeaurora.org> | 2015-08-31 19:37:10 +0530 |
|---|---|---|
| committer | Ethan Chen <intervigil@gmail.com> | 2016-06-23 17:07:46 -0700 |
| commit | 88db18ef62513cd7d9199cbb28b3ee3a169d143a (patch) | |
| tree | 253e34520d2880571c113b88f8f83d3dedab2e9f /service | |
| parent | 6d15b6e87916c7716a250fb210bdbc6a2dc3ab75 (diff) | |
| download | frameworks_opt_net_wifi-88db18ef62513cd7d9199cbb28b3ee3a169d143a.tar.gz frameworks_opt_net_wifi-88db18ef62513cd7d9199cbb28b3ee3a169d143a.tar.bz2 frameworks_opt_net_wifi-88db18ef62513cd7d9199cbb28b3ee3a169d143a.zip | |
wifi: Bring back mIsWiFiIpReachabilityEnabled check
This appears to be a merge-induced breakage. Original commit:
https://github.com/CyanogenMod/android_frameworks_opt_net_wifi/commit/75b9d88468fbfff6a486d6df41215909a2cc9a93
Change-Id: I6935de7cbbd20881f3b15dbb9f5de692e9d38a9a
Signed-off-by: Zdrowy Gosciu <ZdrowyGosciu+GITHUB@gmail.com>
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 1c06e71..0aca11e 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -8536,18 +8536,20 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno // cause the roam to faile and the device to disconnect clearCurrentConfigBSSID("L2ConnectedState"); - try { - mIpReachabilityMonitor = new IpReachabilityMonitor( - mContext, - mInterfaceName, - new IpReachabilityMonitor.Callback() { - @Override - public void notifyLost(InetAddress ip, String logMsg) { - sendMessage(CMD_IP_REACHABILITY_LOST, logMsg); - } - }); - } catch (IllegalArgumentException e) { - Log.wtf("Failed to create IpReachabilityMonitor", e); + if (mIsWiFiIpReachabilityEnabled) { + try { + mIpReachabilityMonitor = new IpReachabilityMonitor( + mContext, + mInterfaceName, + new IpReachabilityMonitor.Callback() { + @Override + public void notifyLost(InetAddress ip, String logMsg) { + sendMessage(CMD_IP_REACHABILITY_LOST, logMsg); + } + }); + } catch (IllegalArgumentException e) { + Log.wtf("Failed to create IpReachabilityMonitor", e); + } } } |