Merge "Let clients access StaticIpConfiguration members through reflection." am: 65663acf34

am: 892038673e

Change-Id: Ice5c4fd4d469a55410129310c5a25874b94e2219
This commit is contained in:
Chalard Jean
2019-05-22 02:42:25 -07:00
committed by android-build-merger

View File

@@ -58,15 +58,15 @@ public final class StaticIpConfiguration implements Parcelable {
@Nullable @Nullable
public LinkAddress ipAddress; public LinkAddress ipAddress;
/** @hide */ /** @hide */
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) @UnsupportedAppUsage
@Nullable @Nullable
public InetAddress gateway; public InetAddress gateway;
/** @hide */ /** @hide */
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) @UnsupportedAppUsage
@NonNull @NonNull
public final ArrayList<InetAddress> dnsServers; public final ArrayList<InetAddress> dnsServers;
/** @hide */ /** @hide */
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) @UnsupportedAppUsage
@Nullable @Nullable
public String domains; public String domains;