LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Don't send NetworkMonitor bcast until systemReady" into lmp-dev

Browse Source
This commit is contained in:
Robert Greenwalt
2014-08-13 23:23:04 +00:00
committed by Android (Google) Code Review
parent 435565dd96 dc2d56124d
commit 1c9613cf01
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -372,6 +372,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {
*/ */
private static final int EVENT_EXPIRE_NET_TRANSITION_WAKELOCK = 24; private static final int EVENT_EXPIRE_NET_TRANSITION_WAKELOCK = 24;
/**
* Used internally to indicate the system is ready.
*/
private static final int EVENT_SYSTEM_READY = 25;
/** Handler used for internal events. */ /** Handler used for internal events. */
final private InternalHandler mHandler; final private InternalHandler mHandler;
@@ -1437,6 +1442,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
final IntentFilter filter = new IntentFilter(Intent.ACTION_USER_PRESENT); final IntentFilter filter = new IntentFilter(Intent.ACTION_USER_PRESENT);
mContext.registerReceiver(mUserPresentReceiver, filter); mContext.registerReceiver(mUserPresentReceiver, filter);
} }
mHandler.sendMessage(mHandler.obtainMessage(EVENT_SYSTEM_READY));
} }
private BroadcastReceiver mUserPresentReceiver = new BroadcastReceiver() { private BroadcastReceiver mUserPresentReceiver = new BroadcastReceiver() {
@@ -2270,6 +2277,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
handleReleaseNetworkRequest((NetworkRequest) msg.obj, msg.arg1); handleReleaseNetworkRequest((NetworkRequest) msg.obj, msg.arg1);
break; break;
} }
case EVENT_SYSTEM_READY: {
for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) {
nai.networkMonitor.systemReady = true;
}
break;
}
} }
} }
} }
@@ -4108,6 +4121,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
new NetworkInfo(networkInfo), new LinkProperties(linkProperties), new NetworkInfo(networkInfo), new LinkProperties(linkProperties),
new NetworkCapabilities(networkCapabilities), currentScore, mContext, mTrackerHandler, new NetworkCapabilities(networkCapabilities), currentScore, mContext, mTrackerHandler,
networkMisc); networkMisc);
synchronized (this) {
nai.networkMonitor.systemReady = mSystemReady;
}
if (VDBG) log("registerNetworkAgent " + nai); if (VDBG) log("registerNetworkAgent " + nai);
mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_AGENT, nai)); mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_AGENT, nai));
} }