From 59a06a05bd9921e61b69dda245dc5c665b74f70f Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Mon, 1 Apr 2019 17:09:05 +0900 Subject: Fix API in CaptivePortal, StaticIpConfiguration - Add documentation to CaptivePortal#logEvent - Add paragraph breaks to StaticIpConfiguration class javadoc - Format javadoc for API documentation - Move setters to a builder and hide fields for apps targeting P or older - Document StaticIpConfiguration getters and builder setters - Add documentation for StaticIpConfiguration#getRoutes Bug: 129362244 Bug: 129433304 Test: built, flashed, booted, WiFi working Test: atest FrameworksNetTests NetworkStackTests Change-Id: Ia66c1097f01ca87d02eba3456547aedb1e480186 --- api/system-current.txt | 12 +++++++++--- api/test-current.txt | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) (limited to 'api') diff --git a/api/system-current.txt b/api/system-current.txt index 1717382272f3..9db6d0851b3f 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 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 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); + 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 ca7410931a50..2f80193b2feb 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 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 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); + 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(); -- cgit v1.2.3-59-g8ed1b