diff options
| author | 2019-04-03 02:12:22 -0700 | |
|---|---|---|
| committer | 2019-04-03 02:12:22 -0700 | |
| commit | e86dfa92fe801936f46303c08093f096b932c19b (patch) | |
| tree | 4aed6364d1b2321811e00b5b406134313d657bd0 /api | |
| parent | 18758e9f90a4e284a47bef2af8a38a598e4b35c5 (diff) | |
| parent | 77daae9b3d78088f2f80c42afb2a707795a18ccc (diff) | |
Merge "Fix API in CaptivePortal, StaticIpConfiguration" am: 0470353c2e
am: 77daae9b3d
Change-Id: I82eee20855710de2b4fb541dd5e2b887140ed364
Diffstat (limited to 'api')
| -rw-r--r-- | api/system-current.txt | 12 | ||||
| -rw-r--r-- | api/test-current.txt | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 1493f7211c45..379df412b137 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3276,13 +3276,19 @@ package android.net { method @Nullable public java.net.InetAddress getGateway(); method @Nullable public android.net.LinkAddress getIpAddress(); method @NonNull public java.util.List<android.net.RouteInfo> getRoutes(@Nullable String); - method public void setDomains(@Nullable String); - method public void setGateway(@Nullable java.net.InetAddress); - method public void setIpAddress(@Nullable android.net.LinkAddress); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.net.StaticIpConfiguration> CREATOR; } + public static final class StaticIpConfiguration.Builder { + ctor public StaticIpConfiguration.Builder(); + method @NonNull public android.net.StaticIpConfiguration build(); + method @NonNull public android.net.StaticIpConfiguration.Builder setDnsServers(@NonNull Iterable<java.net.InetAddress>); + method @NonNull public android.net.StaticIpConfiguration.Builder setDomains(@Nullable String); + method @NonNull public android.net.StaticIpConfiguration.Builder setGateway(@Nullable java.net.InetAddress); + method @NonNull public android.net.StaticIpConfiguration.Builder setIpAddress(@Nullable android.net.LinkAddress); + } + public class TrafficStats { method public static void setThreadStatsTagApp(); method public static void setThreadStatsTagBackup(); diff --git a/api/test-current.txt b/api/test-current.txt index 13b3d96ed220..372a9226539c 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -696,13 +696,19 @@ package android.net { method @Nullable public java.net.InetAddress getGateway(); method @Nullable public android.net.LinkAddress getIpAddress(); method @NonNull public java.util.List<android.net.RouteInfo> getRoutes(@Nullable String); - method public void setDomains(@Nullable String); - method public void setGateway(@Nullable java.net.InetAddress); - method public void setIpAddress(@Nullable android.net.LinkAddress); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.net.StaticIpConfiguration> CREATOR; } + public static final class StaticIpConfiguration.Builder { + ctor public StaticIpConfiguration.Builder(); + method @NonNull public android.net.StaticIpConfiguration build(); + method @NonNull public android.net.StaticIpConfiguration.Builder setDnsServers(@NonNull Iterable<java.net.InetAddress>); + method @NonNull public android.net.StaticIpConfiguration.Builder setDomains(@Nullable String); + method @NonNull public android.net.StaticIpConfiguration.Builder setGateway(@Nullable java.net.InetAddress); + method @NonNull public android.net.StaticIpConfiguration.Builder setIpAddress(@Nullable android.net.LinkAddress); + } + public final class TestNetworkInterface implements android.os.Parcelable { ctor public TestNetworkInterface(android.os.ParcelFileDescriptor, String); method public int describeContents(); |