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"

Browse Source 
am: 7b625191e2

Change-Id: I032ba648ec0476ab8a02a710e2ae485ab4a590b8
This commit is contained in:
Rubin Xu
2017-09-12 11:23:20 +00:00
committed by android-build-merger
parent 6b2ccf4ad7 efc3c4a547
commit 2f36b7afbb
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

@@ -4641,7 +4641,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 +
@@ -4651,8 +4652,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);
} }