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

Commit d9685fac authored by Jeff Davidson's avatar Jeff Davidson Committed by Android Git Automerger
Browse files

am ea651a4f: Merge "Update network selections on capability change." into lmp-mr1-dev 

* commit 'ea651a4f':
  Update network selections on capability change.
parents 093e9890 ea651a4f

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

+1 −2
Original line number Diff line number Diff line
@@ -3701,12 +3701,11 @@ public class ConnectivityService extends IConnectivityManager.Stub { 


    private void updateCapabilities(NetworkAgentInfo networkAgent,

            NetworkCapabilities networkCapabilities) {

        //  TODO - turn this on in MR1 when we have more dogfooding time.

        // rematchAllNetworksAndRequests();

        if (!Objects.equals(networkAgent.networkCapabilities, networkCapabilities)) {

            synchronized (networkAgent) {

                networkAgent.networkCapabilities = networkCapabilities;

            }

            rematchAllNetworksAndRequests(networkAgent, networkAgent.getCurrentScore());

            notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_CAP_CHANGED);

        }

    }