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

Commit 1ff9b10f authored by Lucas Lin's avatar Lucas Lin Committed by Gerrit Code Review
Browse files

Merge changes Ic2357dcf,Iddf8c71a 

* changes:
  Expose NetworkAgent constructor taking a NetworkScore parameter
  Expose NetworkScore to external caller
parents 276f8e6a 4e0db4bb

packages/Connectivity/framework/api/system-current.txt

+14 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ package android.net { 


  public abstract class NetworkAgent {

    ctor public NetworkAgent(@NonNull android.content.Context, @NonNull android.os.Looper, @NonNull String, @NonNull android.net.NetworkCapabilities, @NonNull android.net.LinkProperties, int, @NonNull android.net.NetworkAgentConfig, @Nullable android.net.NetworkProvider);

    ctor public NetworkAgent(@NonNull android.content.Context, @NonNull android.os.Looper, @NonNull String, @NonNull android.net.NetworkCapabilities, @NonNull android.net.LinkProperties, @NonNull android.net.NetworkScore, @NonNull android.net.NetworkAgentConfig, @Nullable android.net.NetworkProvider);

    method @Nullable public android.net.Network getNetwork();

    method public void markConnected();

    method public void onAddKeepalivePacketFilter(int, @NonNull android.net.KeepalivePacketData);
@@ -316,6 +317,19 @@ package android.net { 
    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP) public android.net.NetworkRequest.Builder setSignalStrength(int);

  }



  public final class NetworkScore implements android.os.Parcelable {

    method public int describeContents();

    method public int getLegacyInt();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkScore> CREATOR;

  }



  public static final class NetworkScore.Builder {

    ctor public NetworkScore.Builder();

    method @NonNull public android.net.NetworkScore build();

    method @NonNull public android.net.NetworkScore.Builder setLegacyInt(int);

  }



  public final class OemNetworkPreferences implements android.os.Parcelable {

    method public int describeContents();

    method @NonNull public java.util.Map<java.lang.String,java.lang.Integer> getNetworkPreferences();

packages/Connectivity/framework/src/android/net/NetworkAgent.java

+0 −1
Original line number Diff line number Diff line
@@ -391,7 +391,6 @@ public abstract class NetworkAgent { 
     * @param score the initial score of this network. Update with sendNetworkScore.

     * @param config an immutable {@link NetworkAgentConfig} for this agent.

     * @param provider the {@link NetworkProvider} managing this agent.

     * @hide TODO : unhide when impl is complete

     */

    public NetworkAgent(@NonNull Context context, @NonNull Looper looper, @NonNull String logTag,

            @NonNull NetworkCapabilities nc, @NonNull LinkProperties lp,

packages/Connectivity/framework/src/android/net/NetworkScore.java

+4 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.net;



import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.os.Parcel;

import android.os.Parcelable;
@@ -29,7 +30,7 @@ import com.android.internal.annotations.VisibleForTesting; 
 * network is considered for a particular use.

 * @hide

 */

// TODO : @SystemApi when the implementation is complete

@SystemApi

public final class NetworkScore implements Parcelable {

    // This will be removed soon. Do *NOT* depend on it for any new code that is not part of

    // a migration.
@@ -62,6 +63,8 @@ public final class NetworkScore implements Parcelable { 


    /**

     * @return whether this score has a particular policy.

     *

     * @hide

     */

    @VisibleForTesting

    public boolean hasPolicy(final int policy) {