Merge "Move hidden APIs into system APIs" am: c606db86c8

am: 44676f50d4

Change-Id: Ibe6fa27d99791e57b1253a9dc990de0706b52fb6
This commit is contained in:
Jack Yu
2018-11-20 19:04:24 -08:00
committed by android-build-merger

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_UNIVERSE;
import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage;
import android.os.Parcel;
import android.os.Parcelable;
@@ -167,7 +168,7 @@ public class LinkAddress implements Parcelable {
* @param prefixLength The prefix length.
* @hide
*/
@UnsupportedAppUsage
@SystemApi
public LinkAddress(InetAddress address, int prefixLength) {
this(address, prefixLength, 0, 0);
this.scope = scopeForUnicastAddress(address);
@@ -190,7 +191,7 @@ public class LinkAddress implements Parcelable {
* @param string The string to parse.
* @hide
*/
@UnsupportedAppUsage
@SystemApi
public LinkAddress(String address) {
this(address, 0, 0);
this.scope = scopeForUnicastAddress(this.address);