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

Merge "Patch incoming LinkProperties before it's visible to the outside" am: 7b625191e2 am: 2f36b7afbb

Browse Source 
am: 2cf8f74180

Change-Id: Ic82526773116db3b80449cb0241a1f80934b3d55
This commit is contained in:
Rubin Xu
2017-09-12 11:34:55 +00:00
committed by android-build-merger
parent 4d602d21ed 2f36b7afbb
commit 74af26095c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4649,7 +4649,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
// Ignore updates for disconnected networks // Ignore updates for disconnected networks
return; return;
} }
// newLp is already a defensive copy.
newLp.ensureDirectlyConnectedRoutes();
if (VDBG) { if (VDBG) {
log("Update of LinkProperties for " + nai.name() + log("Update of LinkProperties for " + nai.name() +
"; created=" + nai.created + "; created=" + nai.created +
@@ -4659,8 +4660,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
synchronized (nai) { synchronized (nai) {
nai.linkProperties = newLp; nai.linkProperties = newLp;
} }
// msg.obj is already a defensive copy.
nai.linkProperties.ensureDirectlyConnectedRoutes();
if (nai.everConnected) { if (nai.everConnected) {
updateLinkProperties(nai, oldLp); updateLinkProperties(nai, oldLp);
} }