Merge "Revert "Add net-utils-framework-net to telephony-common"" am: 70b8999d85 (124d48dd) · Commits · e / os / android_frameworks_opt_telephony

Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,6 @@ java_library {
		"ecc-protos-lite",
		"libphonenumber-nogeocoder",
		"PlatformProperties",
		"net-utils-framework-common",
		"telephony-protos",
		],

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

+9 −16

Original line number	Diff line number	Diff line
		@@ -19,9 +19,8 @@ package com.android.internal.telephony.dataconnection;
		import android.content.Context;
		import android.hardware.radio.V1_4.DataConnActiveStatus;
		import android.net.LinkAddress;
		import android.net.util.LinkPropertiesUtils;
		import android.net.util.LinkPropertiesUtils.CompareResult;
		import android.net.util.NetUtils;
		import android.net.LinkProperties.CompareResult;
		import android.net.NetworkUtils;
		import android.os.AsyncResult;
		import android.os.Handler;
		import android.os.Message;
		@@ -323,21 +322,15 @@ public class DcController extends StateMachine {
		if (result.oldLp.equals(result.newLp)) {
		if (DBG) log("onDataStateChanged: no change");
		} else {
		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 (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 the same address type was removed and
		// added we need to cleanup
		CompareResult<LinkAddress> car =
		LinkPropertiesUtils.compareAddresses(result.oldLp,
		result.newLp);
		result.oldLp.compareAddresses(result.newLp);
		if (DBG) {
		log("onDataStateChanged: oldLp=" + result.oldLp +
		" newLp=" + result.newLp + " car=" + car);
		@@ -345,7 +338,7 @@ public class DcController extends StateMachine {
		boolean needToClean = false;
		for (LinkAddress added : car.added) {
		for (LinkAddress removed : car.removed) {
		if (NetUtils.addressTypeMatches(
		if (NetworkUtils.addressTypeMatches(
		removed.getAddress(),
		added.getAddress())) {
		needToClean = true;