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

Commit 41bd3c57 authored by Chalard Jean's avatar Chalard Jean Committed by android-build-merger
Browse files

Merge "Reinstate access to a forgotten member" am: ab6ab9e4 

am: 2f4bd91b

Change-Id: Ib279c0076016c53e0491fc0df8cefff8ae280d66
parents 170c2ee6 2f4bd91b

core/java/android/net/StaticIpConfiguration.java

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.annotation.SystemApi; 
import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.net.shared.InetAddressUtils;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcelable;
@@ -54,7 +53,7 @@ import java.util.Objects; 
@TestApi

public final class StaticIpConfiguration implements Parcelable {

    /** @hide */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    @Nullable

    public LinkAddress ipAddress;

    /** @hide */