diff options
| author | 2018-11-20 19:04:24 -0800 | |
|---|---|---|
| committer | 2018-11-20 19:04:24 -0800 | |
| commit | af2218bde68f0eefe623bc0967e40bfd0f5b3ad5 (patch) | |
| tree | d57d723fd5c4b48a997cacdf2190da047a1c52bc | |
| parent | a7063f1830280e180a1fa0dff4bd7446d6a8f767 (diff) | |
| parent | c3375240ba188bad3b70fb6d2c2c87a1aad131c7 (diff) | |
Merge "Move hidden APIs into system APIs" am: 860d8d0d80
am: c3375240ba
Change-Id: Ibe6fa27d99791e57b1253a9dc990de0706b52fb6
| -rw-r--r-- | api/system-current.txt | 5 | ||||
| -rw-r--r-- | core/java/android/net/LinkAddress.java | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 8cd2ca6c54ff..e60d649a9bbb 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3090,6 +3090,11 @@ package android.net { method public void onTetheringStarted(); } + public class LinkAddress implements android.os.Parcelable { + ctor public LinkAddress(java.net.InetAddress, int); + ctor public LinkAddress(java.lang.String); + } + public final class NetworkCapabilities implements android.os.Parcelable { field public static final int NET_CAPABILITY_OEM_PAID = 22; // 0x16 } diff --git a/core/java/android/net/LinkAddress.java b/core/java/android/net/LinkAddress.java index 1bc0d327abde..77562dbd7bfa 100644 --- a/core/java/android/net/LinkAddress.java +++ b/core/java/android/net/LinkAddress.java @@ -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); |