Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a41b761 authored by Paul Jensen's avatar Paul Jensen Committed by android-build-merger
Browse files

am 60944390: Merge "Remember to cancel lingering when a network again... 

am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
automerge: 63e2b8e0

* commit '63e2b8e0':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
parents 2a7991ee 63e2b8e0

services/core/java/com/android/server/ConnectivityService.java

+4 −0
Original line number Diff line number Diff line
@@ -2069,6 +2069,9 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    // may trigger a re-evaluation of the network.

    private void unlinger(NetworkAgentInfo nai) {

        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.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_CONNECTED);

    }
@@ -4034,6 +4037,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                    } else {

                        if (DBG) log("   accepting network in place of null");

                    }

                    unlinger(newNetwork);

                    mNetworkForRequestId.put(nri.request.requestId, newNetwork);

                    newNetwork.addRequest(nri.request);

                    keep = true;