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

Commit 901d550d authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Add comments to the process*FromAgent methods." am: c779768d am: 5ce4c6d2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519518

Change-Id: I9d3d9d49fe6118edc4357edc1350d1f2b89f4b2a
parents 1dc6a7ab 5ce4c6d2
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -6052,6 +6052,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
     * Stores into |nai| any data coming from the agent that might also be written to the network's
     * LinkProperties by ConnectivityService itself. This ensures that the data provided by the
     * agent is not lost when updateLinkProperties is called.
     * This method should never alter the agent's LinkProperties, only store data in |nai|.
     */
    private void processLinkPropertiesFromAgent(NetworkAgentInfo nai, LinkProperties lp) {
        lp.ensureDirectlyConnectedRoutes();
@@ -6353,6 +6354,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
     * Stores into |nai| any data coming from the agent that might also be written to the network's
     * NetworkCapabilities by ConnectivityService itself. This ensures that the data provided by the
     * agent is not lost when updateCapabilities is called.
     * This method should never alter the agent's NetworkCapabilities, only store data in |nai|.
     */
    private void processCapabilitiesFromAgent(NetworkAgentInfo nai, NetworkCapabilities nc) {
        nai.declaredMetered = !nc.hasCapability(NET_CAPABILITY_NOT_METERED);