Merge "Add docs for Linkproperties and unhide it."

SlimSaber · May 19, 2014 · 34c8319 · 34c8319
2 parents 53bccb7 + 4f05d55
commit 34c8319
Show file tree

Hide file tree

Showing 2 changed files with 162 additions and 37 deletions.
diff --git a/api/current.txt b/api/current.txt
@@ -15885,6 +15885,38 @@ package android.net {
     method public void writeToParcel(android.os.Parcel, int);
   }
 
+  public class LinkProperties implements android.os.Parcelable {
+    ctor public LinkProperties();
+    ctor public LinkProperties(android.net.LinkProperties);
+    method public void addDns(java.net.InetAddress);
+    method public boolean addLinkAddress(android.net.LinkAddress);
+    method public void addRoute(android.net.RouteInfo);
+    method public void clear();
+    method public int describeContents();
+    method public java.util.Collection<java.lang.String> getAllInterfaceNames();
+    method public java.util.Collection<java.net.InetAddress> getDnses();
+    method public java.lang.String getDomains();
+    method public android.net.ProxyInfo getHttpProxy();
+    method public java.lang.String getInterfaceName();
+    method public java.util.Collection<android.net.LinkAddress> getLinkAddresses();
+    method public java.util.Collection<android.net.RouteInfo> getRoutes();
+    method public boolean hasIPv4Address();
+    method public boolean hasIPv6Address();
+    method public boolean removeLinkAddress(android.net.LinkAddress);
+    method public void setDomains(java.lang.String);
+    method public void setHttpProxy(android.net.ProxyInfo);
+    method public void setInterfaceName(java.lang.String);
+    method public void setLinkAddresses(java.util.Collection<android.net.LinkAddress>);
+    method public void writeToParcel(android.os.Parcel, int);
+    field public static final android.os.Parcelable.Creator CREATOR;
+  }
+
+  public static class LinkProperties.CompareResult {
+    ctor public LinkProperties.CompareResult();
+    field public java.util.Collection added;
+    field public java.util.Collection removed;
+  }
+
   public class LocalServerSocket {
     ctor public LocalServerSocket(java.lang.String) throws java.io.IOException;
     ctor public LocalServerSocket(java.io.FileDescriptor) throws java.io.IOException;