Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3375240 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Move hidden APIs into system APIs" 

am: 860d8d0d

Change-Id: Ic35d305ce0a7e6d0472bfe76ee00034abdd918c5
parents 652dffda 860d8d0d

api/system-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -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

  }

core/java/android/net/LinkAddress.java

+3 −2
Original line number Diff line number Diff line
@@ -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);