commit 0e5999009d4a671d7e3e5c12abe9fa37d38a1d57
author Aaron Huang <huangaaron@google.com> Mon Dec 16 21:13:05 2019 +0800
committer Remi NGUYEN VAN <reminv@google.com> Tue Jan 14 16:16:45 2020 +0900
tree 21c45a5e280a54119d6193c7188447097749cda3
parent dd5a342b572501e7bf82e9a73754763d6f6a65b1

Add net-utils-framework-net to telephony-common

Add static net library to telephony-common for
mainline support.

Bug: 138306002
Test: FrameworksTelephonyTests
Exempt-From-Owner-Approval: identical AOSP CL aosp/1192017 already approved by telephony OWNERS
Change-Id: I9e0f297e01fab23ba3cb8b7d3fe9985a89934ee3

Android.bp

diff --git a/Android.bp b/Android.bp
index 7267595..ca895be 100644
--- a/Android.bp
+++ b/Android.bp
@@ -99,6 +99,7 @@
         "ecc-protos-lite",
         "libphonenumber-nogeocoder",
         "PlatformProperties",
+        "net-utils-framework-common",
         "telephony-protos",
     ],
 

src/java/com/android/internal/telephony/dataconnection/DcController.java

diff --git a/src/java/com/android/internal/telephony/dataconnection/DcController.java b/src/java/com/android/internal/telephony/dataconnection/DcController.java
index 62dbdca..4104013 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcController.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcController.java
@@ -19,8 +19,9 @@
 import android.content.Context;
 import android.hardware.radio.V1_4.DataConnActiveStatus;
 import android.net.LinkAddress;
-import android.net.LinkProperties.CompareResult;
-import android.net.NetworkUtils;
+import android.net.util.LinkPropertiesUtils;
+import android.net.util.LinkPropertiesUtils.CompareResult;
+import android.net.util.NetUtils;
 import android.os.AsyncResult;
 import android.os.Handler;
 import android.os.Message;
@@ -322,15 +323,21 @@
                         if (result.oldLp.equals(result.newLp)) {
                             if (DBG) log("onDataStateChanged: no change");
                         } else {
-                            if (result.oldLp.isIdenticalInterfaceName(result.newLp)) {
-                                if (! result.oldLp.isIdenticalDnses(result.newLp) ||
-                                        ! result.oldLp.isIdenticalRoutes(result.newLp) ||
-                                        ! result.oldLp.isIdenticalHttpProxy(result.newLp) ||
-                                        ! result.oldLp.isIdenticalAddresses(result.newLp)) {
+                            if (LinkPropertiesUtils.isIdenticalInterfaceName(
+                                    result.oldLp, result.newLp)) {
+                                if (!LinkPropertiesUtils.isIdenticalDnses(
+                                        result.oldLp, result.newLp)
+                                        || !LinkPropertiesUtils.isIdenticalRoutes(
+                                                result.oldLp, result.newLp)
+                                        || !LinkPropertiesUtils.isIdenticalHttpProxy(
+                                                result.oldLp, result.newLp)
+                                        || !LinkPropertiesUtils.isIdenticalAddresses(
+                                                result.oldLp, result.newLp)) {
                                     // If the same address type was removed and
                                     // added we need to cleanup
                                     CompareResult<LinkAddress> car =
-                                        result.oldLp.compareAddresses(result.newLp);
+                                            LinkPropertiesUtils.compareAddresses(result.oldLp,
+                                                    result.newLp);
                                     if (DBG) {
                                         log("onDataStateChanged: oldLp=" + result.oldLp +
                                                 " newLp=" + result.newLp + " car=" + car);
@@ -338,7 +345,7 @@
                                     boolean needToClean = false;
                                     for (LinkAddress added : car.added) {
                                         for (LinkAddress removed : car.removed) {
-                                            if (NetworkUtils.addressTypeMatches(
+                                            if (NetUtils.addressTypeMatches(
                                                     removed.getAddress(),
                                                     added.getAddress())) {
                                                 needToClean = true;