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

When adding a NetworkRequest, cancel linger for satisfying Network.

Browse Source 
This fixes a problem where a requested network can later suddenly disappear if
it was lingering when the request arrived and later the linger timeout expired.

bug:15927234
Change-Id: Ib3fae45820ce4421e3bc5b623937a16d5f1efa0f
This commit is contained in:
Paul Jensen
2014-07-02 12:02:59 -04:00
committed by The Android Automerger
parent d46c879b64
commit 8729530aa0
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3332,6 +3332,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
if (bestNetwork != null) { if (bestNetwork != null) {
if (VDBG) log("using " + bestNetwork.name()); if (VDBG) log("using " + bestNetwork.name());
if (nri.isRequest && bestNetwork.networkInfo.isConnected()) {
// Cancel any lingering so the linger timeout doesn't teardown this network
// even though we have a request for it.
bestNetwork.networkLingered.clear();
bestNetwork.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_CONNECTED);
}
bestNetwork.addRequest(nri.request); bestNetwork.addRequest(nri.request);
mNetworkForRequestId.put(nri.request.requestId, bestNetwork); mNetworkForRequestId.put(nri.request.requestId, bestNetwork);
int legacyType = nri.request.legacyType; int legacyType = nri.request.legacyType;