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

Commit d92c3a72 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Move OemNetworkPreferences to Connectivity" am: 23cca128 am:... 

Merge "Move OemNetworkPreferences to Connectivity" am: 23cca128 am: 819f20fe am: 8ad13e49 am: facfd3be

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66e64449796794cc48916d86cdec54c1b8971a3e
parents c49e3e84 facfd3be

core/api/system-current.txt

+0 −20
Original line number Diff line number Diff line
@@ -7235,26 +7235,6 @@ package android.net { 
    ctor public NetworkStats.Entry(@Nullable String, int, int, int, int, int, int, long, long, long, long, long);

  }













  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();













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













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













    field public static final int OEM_NETWORK_PREFERENCE_OEM_PAID = 1; // 0x1













    field public static final int OEM_NETWORK_PREFERENCE_OEM_PAID_NO_FALLBACK = 2; // 0x2













    field public static final int OEM_NETWORK_PREFERENCE_OEM_PAID_ONLY = 3; // 0x3













    field public static final int OEM_NETWORK_PREFERENCE_OEM_PRIVATE_ONLY = 4; // 0x4













    field public static final int OEM_NETWORK_PREFERENCE_UNINITIALIZED = 0; // 0x0













  }

























  public static final class OemNetworkPreferences.Builder {













    ctor public OemNetworkPreferences.Builder();













    ctor public OemNetworkPreferences.Builder(@NonNull android.net.OemNetworkPreferences);













    method @NonNull public android.net.OemNetworkPreferences.Builder addNetworkPreference(@NonNull String, int);













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













    method @NonNull public android.net.OemNetworkPreferences.Builder clearNetworkPreference(@NonNull String);













  }



























  public class RssiCurve implements android.os.Parcelable {















    ctor public RssiCurve(int, int, byte[]);















    ctor public RssiCurve(int, int, byte[], int);





































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



+20
−0




























Original line number
Diff line number
Diff line








@@ -320,6 +320,26 @@ package android.net {













    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP) public android.net.NetworkRequest.Builder setSignalStrength(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();













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













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













    field public static final int OEM_NETWORK_PREFERENCE_OEM_PAID = 1; // 0x1













    field public static final int OEM_NETWORK_PREFERENCE_OEM_PAID_NO_FALLBACK = 2; // 0x2













    field public static final int OEM_NETWORK_PREFERENCE_OEM_PAID_ONLY = 3; // 0x3













    field public static final int OEM_NETWORK_PREFERENCE_OEM_PRIVATE_ONLY = 4; // 0x4













    field public static final int OEM_NETWORK_PREFERENCE_UNINITIALIZED = 0; // 0x0













  }



























  public static final class OemNetworkPreferences.Builder {













    ctor public OemNetworkPreferences.Builder();













    ctor public OemNetworkPreferences.Builder(@NonNull android.net.OemNetworkPreferences);













    method @NonNull public android.net.OemNetworkPreferences.Builder addNetworkPreference(@NonNull String, int);













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













    method @NonNull public android.net.OemNetworkPreferences.Builder clearNetworkPreference(@NonNull String);













  }





























  public abstract class QosCallback {















    ctor public QosCallback();















    method public void onError(@NonNull android.net.QosCallbackException);