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

Commit 1892115a authored by Chalard Jean's avatar Chalard Jean
Browse files

[NS A22] Small refactoring 

The point of this is to be able to move parts of processListenRequests
independently.

Test: FrameworksNetTests
Change-Id: I6c889b15696123c1120221977b0f36fa3d91de56
parent 3cf4e7f1

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

+13 −5
Original line number Diff line number Diff line
@@ -6271,8 +6271,18 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        updateAllVpnsCapabilities();

    }



    private void processListenRequests(NetworkAgentInfo nai, boolean capabilitiesChanged) {

    private void processListenRequests(@NonNull NetworkAgentInfo nai, boolean capabilitiesChanged) {

        // For consistency with previous behaviour, send onLost callbacks before onAvailable.

        processNewlyLostListenRequests(nai);



        if (capabilitiesChanged) {

            notifyNetworkCallbacks(nai, ConnectivityManager.CALLBACK_CAP_CHANGED);

        }



        processNewlySatisfiedListenRequests(nai);

    }



    private void processNewlyLostListenRequests(@NonNull final NetworkAgentInfo nai) {

        for (NetworkRequestInfo nri : mNetworkRequests.values()) {

            NetworkRequest nr = nri.request;

            if (!nr.isListen()) continue;
@@ -6281,11 +6291,9 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                callCallbackForRequest(nri, nai, ConnectivityManager.CALLBACK_LOST, 0);

            }

        }



        if (capabilitiesChanged) {

            notifyNetworkCallbacks(nai, ConnectivityManager.CALLBACK_CAP_CHANGED);

    }



    private void processNewlySatisfiedListenRequests(@NonNull final NetworkAgentInfo nai) {

        for (NetworkRequestInfo nri : mNetworkRequests.values()) {

            NetworkRequest nr = nri.request;

            if (!nr.isListen()) continue;