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

Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev

Browse Source
This commit is contained in:
Paul Jensen
2015-01-10 01:59:43 +00:00
committed by Android (Google) Code Review
parent 6d3cff1264 573a0354c5
commit 60944390cd
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2069,6 +2069,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
// may trigger a re-evaluation of the network. // may trigger a re-evaluation of the network.
private void unlinger(NetworkAgentInfo nai) { private void unlinger(NetworkAgentInfo nai) {
if (VDBG) log("Canceling linger of " + nai.name()); if (VDBG) log("Canceling linger of " + nai.name());
// If network has never been validated, it cannot have been lingered, so don't bother
// needlessly triggering a re-evaluation.
if (!nai.everValidated) return;
nai.networkLingered.clear(); nai.networkLingered.clear();
nai.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_CONNECTED); nai.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_CONNECTED);
} }
@@ -4034,6 +4037,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
} else { } else {
if (DBG) log(" accepting network in place of null"); if (DBG) log(" accepting network in place of null");
} }
unlinger(newNetwork);
mNetworkForRequestId.put(nri.request.requestId, newNetwork); mNetworkForRequestId.put(nri.request.requestId, newNetwork);
newNetwork.addRequest(nri.request); newNetwork.addRequest(nri.request);
keep = true; keep = true;