LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add comments to the process*FromAgent methods." am: 522180e236

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

Change-Id: Ia90b3ae008561b2ec3723770802815b46937022e
This commit is contained in:
Lorenzo Colitti
2020-12-07 17:07:08 +00:00
committed by Automerger Merge Worker
parent 963a72a3d4 522180e236
commit 07bc0cc9c5
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -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 * 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 * LinkProperties by ConnectivityService itself. This ensures that the data provided by the
* agent is not lost when updateLinkProperties is called. * 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) { private void processLinkPropertiesFromAgent(NetworkAgentInfo nai, LinkProperties lp) {
lp.ensureDirectlyConnectedRoutes(); 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 * 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 * NetworkCapabilities by ConnectivityService itself. This ensures that the data provided by the
* agent is not lost when updateCapabilities is called. * 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) { private void processCapabilitiesFromAgent(NetworkAgentInfo nai, NetworkCapabilities nc) {
nai.declaredMetered = !nc.hasCapability(NET_CAPABILITY_NOT_METERED); nai.declaredMetered = !nc.hasCapability(NET_CAPABILITY_NOT_METERED);