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

Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev

Browse Source
This commit is contained in:
Lorenzo Colitti
2014-10-28 07:00:30 +00:00
committed by Android (Google) Code Review
parent 1680d4b7f7 b858857706
commit a06675a2b5
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/net/LinkProperties.java
View File

@@ -493,16 +493,16 @@ public final class LinkProperties implements Parcelable {
/**
* Removes a stacked link.
*
* If there a stacked link with the same interfacename as link, it is
* If there is a stacked link with the given interface name, it is
* removed. Otherwise, nothing changes.
*
* @param link The link to remove.
* @param iface The interface name of the link to remove.
* @return true if the link was removed, false otherwise.
* @hide
*/
public boolean removeStackedLink(LinkProperties link) {
if (link != null && link.getInterfaceName() != null) {
LinkProperties removed = mStackedLinks.remove(link.getInterfaceName());
public boolean removeStackedLink(String iface) {
if (iface != null) {
LinkProperties removed = mStackedLinks.remove(iface);
return removed != null;
}
return false;

6
core/tests/coretests/src/android/net/LinkPropertiesTest.java
View File

@@ -338,14 +338,14 @@ public class LinkPropertiesTest extends TestCase {
assertFalse("newname".equals(link.getInterfaceName()));
}
assertTrue(rmnet0.removeStackedLink(clat4));
assertTrue(rmnet0.removeStackedLink("clat4"));
assertEquals(0, rmnet0.getStackedLinks().size());
assertEquals(1, rmnet0.getAddresses().size());
assertEquals(1, rmnet0.getLinkAddresses().size());
assertEquals(1, rmnet0.getAllAddresses().size());
assertEquals(1, rmnet0.getAllLinkAddresses().size());
assertFalse(rmnet0.removeStackedLink(clat4));
assertFalse(rmnet0.removeStackedLink("clat4"));
}
private LinkAddress getFirstLinkAddress(LinkProperties lp) {
@@ -370,7 +370,7 @@ public class LinkPropertiesTest extends TestCase {
assertTrue(stacked.hasGlobalIPv6Address());
assertFalse(lp.hasIPv4Address());
assertFalse(lp.hasGlobalIPv6Address());
lp.removeStackedLink(stacked);
lp.removeStackedLink("stacked");
assertFalse(lp.hasIPv4Address());
assertFalse(lp.hasGlobalIPv6Address());

2
services/core/java/com/android/server/connectivity/Nat464Xlat.java
View File

@@ -217,7 +217,7 @@ public class Nat464Xlat extends BaseNetworkObserver {
NetworkUtils.resetConnections(
CLAT_INTERFACE_NAME,
NetworkUtils.RESET_IPV4_ADDRESSES);
mBaseLP.removeStackedLink(mLP);
mBaseLP.removeStackedLink(CLAT_INTERFACE_NAME);
updateConnectivityService();
}
Slog.i(TAG, "interface " + CLAT_INTERFACE_NAME +