summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/system-current.txt5
-rw-r--r--core/java/android/net/LinkAddress.java5
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);