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

Merge "Refactor CompareResult<> class and its call sites"

Browse Source
This commit is contained in:
Rubin Xu
2017-09-13 09:35:04 +00:00
committed by Gerrit Code Review
parent 68269d2331 8cb82d2530
commit 008917b44f
3 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4435,12 +4435,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
private void updateInterfaces(LinkProperties newLp, LinkProperties oldLp, int netId,
NetworkCapabilities caps) {
CompareResult<String> interfaceDiff = new CompareResult<String>();
if (oldLp != null) {
interfaceDiff = oldLp.compareAllInterfaceNames(newLp);
} else if (newLp != null) {
interfaceDiff.added = newLp.getAllInterfaceNames();
}
CompareResult<String> interfaceDiff = new CompareResult<String>(
oldLp != null ? oldLp.getAllInterfaceNames() : null,
newLp != null ? newLp.getAllInterfaceNames() : null);
for (String iface : interfaceDiff.added) {
try {
if (DBG) log("Adding iface " + iface + " to network " + netId);
@@ -4466,12 +4463,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
* @return true if routes changed between oldLp and newLp
*/
private boolean updateRoutes(LinkProperties newLp, LinkProperties oldLp, int netId) {
CompareResult<RouteInfo> routeDiff = new CompareResult<RouteInfo>();
if (oldLp != null) {
routeDiff = oldLp.compareAllRoutes(newLp);
} else if (newLp != null) {
routeDiff.added = newLp.getAllRoutes();
}
// Compare the route diff to determine which routes should be added and removed.
CompareResult<RouteInfo> routeDiff = new CompareResult<RouteInfo>(
oldLp != null ? oldLp.getAllRoutes() : null,
newLp != null ? newLp.getAllRoutes() : null);
// add routes before removing old in case it helps with continuous connectivity