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

Commit 874dec6b authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev

parents 4619e6e1 f76c29b5

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

+7 −2
Original line number Diff line number Diff line
@@ -4323,9 +4323,11 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        enforceInternetPermission();

        final int uid = Binder.getCallingUid();

        final int connectivityInfo = encodeBool(hasConnectivity);

        mHandler.sendMessage(

                mHandler.obtainMessage(EVENT_REVALIDATE_NETWORK, uid, connectivityInfo, network));



        // Handle ConnectivityDiagnostics event before attempting to revalidate the network. This

        // forces an ordering of ConnectivityDiagnostics events in the case where hasConnectivity

        // does not match the known connectivity of the network - this causes NetworkMonitor to

        // revalidate the network and generate a ConnectivityDiagnostics ConnectivityReport event.

        final NetworkAgentInfo nai;

        if (network == null) {

            nai = getDefaultNetwork();
@@ -4338,6 +4340,9 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                            ConnectivityDiagnosticsHandler.EVENT_NETWORK_CONNECTIVITY_REPORTED,

                            connectivityInfo, 0, nai));

        }



        mHandler.sendMessage(

                mHandler.obtainMessage(EVENT_REVALIDATE_NETWORK, uid, connectivityInfo, network));

    }



    private void handleReportNetworkConnectivity(