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

SettingsLib/Wifi: Run pause/resumes on main thread

Browse Source 
To avoid our objects from disappearing out from under us.

Bug: 21581533
Change-Id: Ia6fc9e56271f79c7d8b0f86f9c35351c39c35d29
This commit is contained in:
Jason Monk
2015-06-03 14:06:34 -04:00
parent e7f68c18bf
commit e04ae8aced
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -357,19 +357,17 @@ public class WifiTracker {
}
private void updateNetworkInfo(NetworkInfo networkInfo) {
if (mScanner != null) {
/* sticky broadcasts can call this when wifi is disabled */
if (!mWifiManager.isWifiEnabled()) {
mScanner.pause();
return;
}
/* sticky broadcasts can call this when wifi is disabled */
if (!mWifiManager.isWifiEnabled()) {
mMainHandler.sendEmptyMessage(MainHandler.MSG_PAUSE_SCANNING);
return;
}
if (networkInfo != null &&
networkInfo.getDetailedState() == DetailedState.OBTAINING_IPADDR) {
mScanner.pause();
} else {
mScanner.resume();
}
if (networkInfo != null &&
networkInfo.getDetailedState() == DetailedState.OBTAINING_IPADDR) {
mMainHandler.sendEmptyMessage(MainHandler.MSG_PAUSE_SCANNING);
} else {
mMainHandler.sendEmptyMessage(MainHandler.MSG_RESUME_SCANNING);
}
mLastInfo = mWifiManager.getConnectionInfo();
@@ -448,6 +446,8 @@ public class WifiTracker {
private static final int MSG_CONNECTED_CHANGED = 0;
private static final int MSG_WIFI_STATE_CHANGED = 1;
private static final int MSG_ACCESS_POINT_CHANGED = 2;
private static final int MSG_RESUME_SCANNING = 3;
private static final int MSG_PAUSE_SCANNING = 4;
public MainHandler(Looper looper) {
super(looper);
@@ -468,6 +468,16 @@ public class WifiTracker {
case MSG_ACCESS_POINT_CHANGED:
mListener.onAccessPointsChanged();
break;
case MSG_RESUME_SCANNING:
if (mScanner != null) {
mScanner.resume();
}
break;
case MSG_PAUSE_SCANNING:
if (mScanner != null) {
mScanner.pause();
}
break;
}
}
}