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

Commit 0c290e9c authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Expose NetworkScore to external caller" into sc-dev am: 6c5499ec 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13947595

Change-Id: I183090aefda855a226bc0b704c5486f8f81ee53b
parents bf393790 6c5499ec

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

+13 −0
Original line number Diff line number Diff line
@@ -323,6 +323,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/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) {