Merge "Move hidden APIs into system APIs"

This commit is contained in:
Jack Yu
2018-11-20 18:56:32 +00:00
committed by Android (Google) Code Review

View File

@@ -25,6 +25,7 @@ import static android.system.OsConstants.RT_SCOPE_LINK;
import static android.system.OsConstants.RT_SCOPE_SITE; import static android.system.OsConstants.RT_SCOPE_SITE;
import static android.system.OsConstants.RT_SCOPE_UNIVERSE; import static android.system.OsConstants.RT_SCOPE_UNIVERSE;
import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@@ -167,7 +168,7 @@ public class LinkAddress implements Parcelable {
* @param prefixLength The prefix length. * @param prefixLength The prefix length.
* @hide * @hide
*/ */
@UnsupportedAppUsage @SystemApi
public LinkAddress(InetAddress address, int prefixLength) { public LinkAddress(InetAddress address, int prefixLength) {
this(address, prefixLength, 0, 0); this(address, prefixLength, 0, 0);
this.scope = scopeForUnicastAddress(address); this.scope = scopeForUnicastAddress(address);
@@ -190,7 +191,7 @@ public class LinkAddress implements Parcelable {
* @param string The string to parse. * @param string The string to parse.
* @hide * @hide
*/ */
@UnsupportedAppUsage @SystemApi
public LinkAddress(String address) { public LinkAddress(String address) {
this(address, 0, 0); this(address, 0, 0);
this.scope = scopeForUnicastAddress(this.address); this.scope = scopeForUnicastAddress(this.address);