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

Commit 2b61c6b1 authored by Paul Jensen's avatar Paul Jensen Committed by Android (Google) Code Review
Browse files

Merge "Don't reevaluate disconnected networks" into mnc-dev

parents f62f4c94 4e8050ed

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

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

        } else {

            nai = getNetworkAgentInfoForNetwork(network);

            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.

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

        if (hasConnectivity == nai.lastValidated) return;

        if (hasConnectivity == nai.lastValidated) return;

        final int uid = Binder.getCallingUid();

        final int uid = Binder.getCallingUid();