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

Change removeStackedLink to take an interface name.

Browse Source 
This simplifies callers.

Also remove all "implementations" of addStackedLink and
removeStackedLink except the one in LinkProperties, because they
are unused.

Bug: 12111730
Change-Id: Ie294b855facba4b1436299dcb3211b72d9ba448e
This commit is contained in:
Lorenzo Colitti
2014-10-20 11:08:03 +09:00
parent 76a545ffc4
commit 3825843c73
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. * 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. * 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. * @return true if the link was removed, false otherwise.
* @hide * @hide
*/ */
public boolean removeStackedLink(LinkProperties link) { public boolean removeStackedLink(String iface) {
if (link != null && link.getInterfaceName() != null) { if (iface != null) {
LinkProperties removed = mStackedLinks.remove(link.getInterfaceName()); LinkProperties removed = mStackedLinks.remove(iface);
return removed != null; return removed != null;
} }
return false; 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())); assertFalse("newname".equals(link.getInterfaceName()));
} }
assertTrue(rmnet0.removeStackedLink(clat4)); assertTrue(rmnet0.removeStackedLink("clat4"));
assertEquals(0, rmnet0.getStackedLinks().size()); assertEquals(0, rmnet0.getStackedLinks().size());
assertEquals(1, rmnet0.getAddresses().size()); assertEquals(1, rmnet0.getAddresses().size());
assertEquals(1, rmnet0.getLinkAddresses().size()); assertEquals(1, rmnet0.getLinkAddresses().size());
assertEquals(1, rmnet0.getAllAddresses().size()); assertEquals(1, rmnet0.getAllAddresses().size());
assertEquals(1, rmnet0.getAllLinkAddresses().size()); assertEquals(1, rmnet0.getAllLinkAddresses().size());
assertFalse(rmnet0.removeStackedLink(clat4)); assertFalse(rmnet0.removeStackedLink("clat4"));
} }
private LinkAddress getFirstLinkAddress(LinkProperties lp) { private LinkAddress getFirstLinkAddress(LinkProperties lp) {
@@ -370,7 +370,7 @@ public class LinkPropertiesTest extends TestCase {
assertTrue(stacked.hasGlobalIPv6Address()); assertTrue(stacked.hasGlobalIPv6Address());
assertFalse(lp.hasIPv4Address()); assertFalse(lp.hasIPv4Address());
assertFalse(lp.hasGlobalIPv6Address()); assertFalse(lp.hasGlobalIPv6Address());
lp.removeStackedLink(stacked); lp.removeStackedLink("stacked");
assertFalse(lp.hasIPv4Address()); assertFalse(lp.hasIPv4Address());
assertFalse(lp.hasGlobalIPv6Address()); 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( NetworkUtils.resetConnections(
CLAT_INTERFACE_NAME, CLAT_INTERFACE_NAME,
NetworkUtils.RESET_IPV4_ADDRESSES); NetworkUtils.RESET_IPV4_ADDRESSES);
mBaseLP.removeStackedLink(mLP); mBaseLP.removeStackedLink(CLAT_INTERFACE_NAME);
updateConnectivityService(); updateConnectivityService();
} }
Slog.i(TAG, "interface " + CLAT_INTERFACE_NAME + Slog.i(TAG, "interface " + CLAT_INTERFACE_NAME +