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

am 74652ebf: am f3edbb55: Merge "Handle network info updates while scanning is paused" into mnc-dev

Browse Source 
* commit '74652ebff190f9ad78ab7d560dd4271c025dd1e2':
  Handle network info updates while scanning is paused
This commit is contained in:
Jason Monk
2015-06-02 21:09:49 +00:00
committed by Android Git Automerger
parent a204ca3f94 74652ebff1
commit d714d6b3ab
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
View File

@@ -357,17 +357,19 @@ public class WifiTracker {
}
private void updateNetworkInfo(NetworkInfo networkInfo) {
/* sticky broadcasts can call this when wifi is disabled */
if (!mWifiManager.isWifiEnabled()) {
mScanner.pause();
return;
}
if (mScanner != null) {
/* sticky broadcasts can call this when wifi is disabled */
if (!mWifiManager.isWifiEnabled()) {
mScanner.pause();
return;
}
if (networkInfo != null &&
networkInfo.getDetailedState() == DetailedState.OBTAINING_IPADDR) {
mScanner.pause();
} else {
mScanner.resume();
if (networkInfo != null &&
networkInfo.getDetailedState() == DetailedState.OBTAINING_IPADDR) {
mScanner.pause();
} else {
mScanner.resume();
}
}
mLastInfo = mWifiManager.getConnectionInfo();