Merge "Patch incoming LinkProperties before it's visible to the outside"
am: 7b625191e2 Change-Id: I032ba648ec0476ab8a02a710e2ae485ab4a590b8
This commit is contained in:
commit
3fdc95a4e7
1 changed files with 2 additions and 3 deletions
|
|
@ -4641,7 +4641,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
|
|||
// Ignore updates for disconnected networks
|
||||
return;
|
||||
}
|
||||
|
||||
// newLp is already a defensive copy.
|
||||
newLp.ensureDirectlyConnectedRoutes();
|
||||
if (VDBG) {
|
||||
log("Update of LinkProperties for " + nai.name() +
|
||||
"; created=" + nai.created +
|
||||
|
|
@ -4651,8 +4652,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
|
|||
synchronized (nai) {
|
||||
nai.linkProperties = newLp;
|
||||
}
|
||||
// msg.obj is already a defensive copy.
|
||||
nai.linkProperties.ensureDirectlyConnectedRoutes();
|
||||
if (nai.everConnected) {
|
||||
updateLinkProperties(nai, oldLp);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue