Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13b62402 authored by Chalard Jean's avatar Chalard Jean Committed by android-build-merger
Browse files

Merge "Let clients access StaticIpConfiguration members through reflection."... 

Merge "Let clients access StaticIpConfiguration members through reflection." am: 94e52502 am: 89203867
am: 6736fb04

Change-Id: I77562c577b704a979a9df0125cb63143a47cacb1
parents ca9905b2 6736fb04

core/java/android/net/StaticIpConfiguration.java

+3 −3
Original line number Diff line number Diff line
@@ -58,15 +58,15 @@ public final class StaticIpConfiguration implements Parcelable { 
    @Nullable

    public LinkAddress ipAddress;

    /** @hide */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    @Nullable

    public InetAddress gateway;

    /** @hide */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    @NonNull

    public final ArrayList<InetAddress> dnsServers;

    /** @hide */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    @Nullable

    public String domains;