Merge "Move OemNetworkPreferences to Connectivity" (23cca128) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+0 −20

Original line number	Diff line number	Diff line
		@@ -6133,26 +6133,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);

core/java/android/net/OemNetworkPreferences.aidl→packages/Connectivity/framework/aidl-export/android/net/OemNetworkPreferences.aidl

+0 −0

File moved.

View file

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

core/java/android/net/OemNetworkPreferences.java→packages/Connectivity/framework/src/android/net/OemNetworkPreferences.java

+0 −0

File moved.

View file