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

Commit 013275d5 authored by Paul Jensen's avatar Paul Jensen Committed by Android Git Automerger
Browse files

am 2b61c6b1: Merge "Don\'t reevaluate disconnected networks" into mnc-dev 

* commit '2b61c6b1':
  Don't reevaluate disconnected networks
parents e4c3fd72 2b61c6b1

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

+4 −1
Original line number Diff line number Diff line
@@ -2711,7 +2711,10 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        } else {

            nai = getNetworkAgentInfoForNetwork(network);

        }

        if (nai == null) return;

        if (nai == null || nai.networkInfo.getState() == NetworkInfo.State.DISCONNECTING ||

            nai.networkInfo.getState() == NetworkInfo.State.DISCONNECTED) {

            return;

        }

        // Revalidate if the app report does not match our current validated state.

        if (hasConnectivity == nai.lastValidated) return;

        final int uid = Binder.getCallingUid();