Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move hidden APIs into system APIs"

Browse Source
This commit is contained in:
Jack Yu
2018-11-21 02:40:30 +00:00
committed by Gerrit Code Review
parent 215a48cff4 4f956e0fca
commit 860d8d0d80
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/system-current.txt
View File

@@ -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
}

5
core/java/android/net/LinkAddress.java
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);