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

resolved conflicts for merge of e6ae3be8 to master

Browse Source 
Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210
This commit is contained in:
Elliott Hughes
2014-04-28 13:53:25 -07:00
parent bbf3eb56b6 e6ae3be829
commit d48bb67aac
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/net/LinkAddress.java
View File

@@ -24,13 +24,13 @@ import java.net.InetAddress;
import java.net.InterfaceAddress; import java.net.InterfaceAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import static libcore.io.OsConstants.IFA_F_DADFAILED; import static android.system.OsConstants.IFA_F_DADFAILED;
import static libcore.io.OsConstants.IFA_F_DEPRECATED; import static android.system.OsConstants.IFA_F_DEPRECATED;
import static libcore.io.OsConstants.IFA_F_TENTATIVE; import static android.system.OsConstants.IFA_F_TENTATIVE;
import static libcore.io.OsConstants.RT_SCOPE_HOST; import static android.system.OsConstants.RT_SCOPE_HOST;
import static libcore.io.OsConstants.RT_SCOPE_LINK; import static android.system.OsConstants.RT_SCOPE_LINK;
import static libcore.io.OsConstants.RT_SCOPE_SITE; import static android.system.OsConstants.RT_SCOPE_SITE;
import static libcore.io.OsConstants.RT_SCOPE_UNIVERSE; import static android.system.OsConstants.RT_SCOPE_UNIVERSE;
/** /**
* Identifies an IP address on a network link. * Identifies an IP address on a network link.

14
core/tests/coretests/src/android/net/LinkAddressTest.java
View File

@@ -32,13 +32,13 @@ import android.os.Parcel;
import android.test.AndroidTestCase; import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.SmallTest;
import static libcore.io.OsConstants.IFA_F_DEPRECATED; import static android.system.OsConstants.IFA_F_DEPRECATED;
import static libcore.io.OsConstants.IFA_F_PERMANENT; import static android.system.OsConstants.IFA_F_PERMANENT;
import static libcore.io.OsConstants.IFA_F_TENTATIVE; import static android.system.OsConstants.IFA_F_TENTATIVE;
import static libcore.io.OsConstants.RT_SCOPE_HOST; import static android.system.OsConstants.RT_SCOPE_HOST;
import static libcore.io.OsConstants.RT_SCOPE_LINK; import static android.system.OsConstants.RT_SCOPE_LINK;
import static libcore.io.OsConstants.RT_SCOPE_SITE; import static android.system.OsConstants.RT_SCOPE_SITE;
import static libcore.io.OsConstants.RT_SCOPE_UNIVERSE; import static android.system.OsConstants.RT_SCOPE_UNIVERSE;
/** /**
* Tests for {@link LinkAddress}. * Tests for {@link LinkAddress}.

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

@@ -18,14 +18,13 @@ package android.net;
import android.net.LinkProperties; import android.net.LinkProperties;
import android.net.RouteInfo; import android.net.RouteInfo;
import android.system.OsConstants;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.SmallTest;
import junit.framework.TestCase; import junit.framework.TestCase;
import java.net.InetAddress; import java.net.InetAddress;
import java.util.ArrayList; import java.util.ArrayList;
import libcore.io.OsConstants;
public class LinkPropertiesTest extends TestCase { public class LinkPropertiesTest extends TestCase {
private static InetAddress ADDRV4 = NetworkUtils.numericToInetAddress("75.208.6.1"); private static InetAddress ADDRV4 = NetworkUtils.numericToInetAddress("75.208.6.1");
private static InetAddress ADDRV6 = NetworkUtils.numericToInetAddress( private static InetAddress ADDRV6 = NetworkUtils.numericToInetAddress(