diff options
| -rw-r--r-- | api/system-current.txt | 11 | ||||
| -rw-r--r-- | core/java/android/net/LinkAddress.java | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 81a3aa17e6b1..61785319a85f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3325,6 +3325,11 @@ package android.net { field public static final int ERROR_INVALID_NETWORK = 1; // 0x1 } + 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 } @@ -3684,7 +3689,8 @@ package android.net.wifi { } public static abstract interface WifiManager.NetworkRequestMatchCallback { - method public abstract void onMatch(java.util.List<android.net.wifi.WifiConfiguration>); + method public abstract void onAbort(); + method public abstract void onMatch(java.util.List<android.net.wifi.ScanResult>); method public abstract void onUserSelectionCallbackRegistration(android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback); method public abstract void onUserSelectionConnectFailure(android.net.wifi.WifiConfiguration); method public abstract void onUserSelectionConnectSuccess(android.net.wifi.WifiConfiguration); @@ -4641,6 +4647,7 @@ package android.rolecontrollerservice { method public abstract void onAddRoleHolder(java.lang.String, java.lang.String, android.app.role.RoleManagerCallback); method public final android.os.IBinder onBind(android.content.Intent); method public abstract void onClearRoleHolders(java.lang.String, android.app.role.RoleManagerCallback); + method public abstract void onGrantDefaultRoles(android.app.role.RoleManagerCallback); method public abstract void onRemoveRoleHolder(java.lang.String, java.lang.String, android.app.role.RoleManagerCallback); field public static final java.lang.String SERVICE_INTERFACE = "android.rolecontrollerservice.RoleControllerService"; } @@ -4795,8 +4802,8 @@ package android.service.carrier { public abstract class ApnService extends android.app.Service { ctor public ApnService(); - method public abstract java.util.List<android.content.ContentValues> onRestoreApns(int); method public android.os.IBinder onBind(android.content.Intent); + method public abstract java.util.List<android.content.ContentValues> onRestoreApns(int); } } 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); |