Merge "Cleaned up the flag network_validation" into main (6f0646d3) · Commits · e / os / android_frameworks_base

core/api/current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -46681,16 +46681,16 @@ package android.telephony {
		method public int getLastCauseCode();
		method @Nullable public android.net.LinkProperties getLinkProperties();
		method public int getNetworkType();
		method @FlaggedApi("com.android.internal.telephony.flags.network_validation") public int getNetworkValidationStatus();
		method public int getNetworkValidationStatus();
		method public int getState();
		method public int getTransportType();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.PreciseDataConnectionState> CREATOR;
		field @FlaggedApi("com.android.internal.telephony.flags.network_validation") public static final int NETWORK_VALIDATION_FAILURE = 4; // 0x4
		field @FlaggedApi("com.android.internal.telephony.flags.network_validation") public static final int NETWORK_VALIDATION_IN_PROGRESS = 2; // 0x2
		field @FlaggedApi("com.android.internal.telephony.flags.network_validation") public static final int NETWORK_VALIDATION_NOT_REQUESTED = 1; // 0x1
		field @FlaggedApi("com.android.internal.telephony.flags.network_validation") public static final int NETWORK_VALIDATION_SUCCESS = 3; // 0x3
		field @FlaggedApi("com.android.internal.telephony.flags.network_validation") public static final int NETWORK_VALIDATION_UNSUPPORTED = 0; // 0x0
		field public static final int NETWORK_VALIDATION_FAILURE = 4; // 0x4
		field public static final int NETWORK_VALIDATION_IN_PROGRESS = 2; // 0x2
		field public static final int NETWORK_VALIDATION_NOT_REQUESTED = 1; // 0x1
		field public static final int NETWORK_VALIDATION_SUCCESS = 3; // 0x3
		field public static final int NETWORK_VALIDATION_UNSUPPORTED = 0; // 0x0
		}

		public final class RadioAccessSpecifier implements android.os.Parcelable {

core/api/system-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -16443,7 +16443,7 @@ package android.telephony.data {
		method @Deprecated public int getMtu();
		method public int getMtuV4();
		method public int getMtuV6();
		method @FlaggedApi("com.android.internal.telephony.flags.network_validation") public int getNetworkValidationStatus();
		method public int getNetworkValidationStatus();
		method @NonNull public java.util.List<java.net.InetAddress> getPcscfAddresses();
		method public int getPduSessionId();
		method public int getProtocolType();
		@@ -16480,7 +16480,7 @@ package android.telephony.data {
		method @Deprecated @NonNull public android.telephony.data.DataCallResponse.Builder setMtu(int);
		method @NonNull public android.telephony.data.DataCallResponse.Builder setMtuV4(int);
		method @NonNull public android.telephony.data.DataCallResponse.Builder setMtuV6(int);
		method @FlaggedApi("com.android.internal.telephony.flags.network_validation") @NonNull public android.telephony.data.DataCallResponse.Builder setNetworkValidationStatus(int);
		method @NonNull public android.telephony.data.DataCallResponse.Builder setNetworkValidationStatus(int);
		method @NonNull public android.telephony.data.DataCallResponse.Builder setPcscfAddresses(@NonNull java.util.List<java.net.InetAddress>);
		method @NonNull public android.telephony.data.DataCallResponse.Builder setPduSessionId(@IntRange(from=android.telephony.data.DataCallResponse.PDU_SESSION_ID_NOT_SET, to=15) int);
		method @NonNull public android.telephony.data.DataCallResponse.Builder setProtocolType(int);
		@@ -16560,7 +16560,7 @@ package android.telephony.data {
		method public final void notifyDataCallListChanged(java.util.List<android.telephony.data.DataCallResponse>);
		method public final void notifyDataProfileUnthrottled(@NonNull android.telephony.data.DataProfile);
		method public void requestDataCallList(@NonNull android.telephony.data.DataServiceCallback);
		method @FlaggedApi("com.android.internal.telephony.flags.network_validation") public void requestNetworkValidation(int, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method public void requestNetworkValidation(int, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method public void setDataProfile(@NonNull java.util.List<android.telephony.data.DataProfile>, boolean, @NonNull android.telephony.data.DataServiceCallback);
		method public void setInitialAttachApn(@NonNull android.telephony.data.DataProfile, boolean, @NonNull android.telephony.data.DataServiceCallback);
		method public void setupDataCall(int, @NonNull android.telephony.data.DataProfile, boolean, boolean, int, @Nullable android.net.LinkProperties, @NonNull android.telephony.data.DataServiceCallback);
		@@ -16622,7 +16622,7 @@ package android.telephony.data {
		method public final int getSlotIndex();
		method public void reportEmergencyDataNetworkPreferredTransportChanged(int);
		method public void reportThrottleStatusChanged(@NonNull java.util.List<android.telephony.data.ThrottleStatus>);
		method @FlaggedApi("com.android.internal.telephony.flags.network_validation") public void requestNetworkValidation(int, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method public void requestNetworkValidation(int, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method public final void updateQualifiedNetworkTypes(int, @NonNull java.util.List<java.lang.Integer>);
		}

telephony/java/android/telephony/PreciseDataConnectionState.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package android.telephony;

		import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -39,7 +38,6 @@ import android.telephony.data.ApnSetting;
		import android.telephony.data.DataCallResponse;
		import android.telephony.data.Qos;

		import com.android.internal.telephony.flags.Flags;
		import com.android.internal.telephony.util.TelephonyUtils;

		import java.lang.annotation.Retention;
		@@ -89,35 +87,30 @@ public final class PreciseDataConnectionState implements Parcelable {
		* Unsupported. The unsupported state is used when the data network cannot support the network
		* validation function for the current data connection state.
		*/
		@FlaggedApi(Flags.FLAG_NETWORK_VALIDATION)
		public static final int NETWORK_VALIDATION_UNSUPPORTED = 0;

		/**
		* Not Requested. The not requested status is used when the data network supports the network
		* validation function, but no network validation is being performed yet.
		*/
		@FlaggedApi(Flags.FLAG_NETWORK_VALIDATION)
		public static final int NETWORK_VALIDATION_NOT_REQUESTED = 1;

		/**
		* In progress. The in progress state is used when the network validation process for the data
		* network is in progress. This state is followed by either success or failure.
		*/
		@FlaggedApi(Flags.FLAG_NETWORK_VALIDATION)
		public static final int NETWORK_VALIDATION_IN_PROGRESS = 2;

		/**
		* Success. The Success status is used when network validation has been completed for the data
		* network and the result is successful.
		*/
		@FlaggedApi(Flags.FLAG_NETWORK_VALIDATION)
		public static final int NETWORK_VALIDATION_SUCCESS = 3;

		/**
		* Failure. The Failure status is used when network validation has been completed for the data
		* network and the result is failure.
		*/
		@FlaggedApi(Flags.FLAG_NETWORK_VALIDATION)
		public static final int NETWORK_VALIDATION_FAILURE = 4;

		/**
		@@ -360,7 +353,6 @@ public final class PreciseDataConnectionState implements Parcelable {
		*
		* @return the network validation status of the data call
		*/
		@FlaggedApi(Flags.FLAG_NETWORK_VALIDATION)
		public @NetworkValidationStatus int getNetworkValidationStatus() {
		return mNetworkValidationStatus;
		}
		@@ -615,7 +607,6 @@ public final class PreciseDataConnectionState implements Parcelable {
		* @param networkValidationStatus the network validation status of the data call
		* @return The builder
		*/
		@FlaggedApi(Flags.FLAG_NETWORK_VALIDATION)
		public @NonNull Builder setNetworkValidationStatus(
		@NetworkValidationStatus int networkValidationStatus) {
		mNetworkValidationStatus = networkValidationStatus;

telephony/java/android/telephony/data/DataCallResponse.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@

		package android.telephony.data;

		import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.IntRange;
		import android.annotation.NonNull;
		@@ -32,7 +31,6 @@ import android.telephony.PreciseDataConnectionState;
		import android.telephony.data.ApnSetting.ProtocolType;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.flags.Flags;
		import com.android.internal.util.Preconditions;

		import java.lang.annotation.Retention;
		@@ -455,7 +453,6 @@ public final class DataCallResponse implements Parcelable {
		*
		* @return The network validation status of data connection.
		*/
		@FlaggedApi(Flags.FLAG_NETWORK_VALIDATION)
		public @PreciseDataConnectionState.NetworkValidationStatus int getNetworkValidationStatus() {
		return mNetworkValidationStatus;
		}
		@@ -936,7 +933,6 @@ public final class DataCallResponse implements Parcelable {
		* @param status The network validation status.
		* @return The same instance of the builder.
		*/
		@FlaggedApi(Flags.FLAG_NETWORK_VALIDATION)
		public @NonNull Builder setNetworkValidationStatus(
		@PreciseDataConnectionState.NetworkValidationStatus int status) {
		mNetworkValidationStatus = status;

telephony/java/android/telephony/data/DataService.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package android.telephony.data;

		import android.annotation.CallbackExecutor;
		import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.IntRange;
		import android.annotation.NonNull;
		@@ -40,7 +39,6 @@ import android.util.SparseArray;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.IIntegerConsumer;
		import com.android.internal.telephony.flags.Flags;
		import com.android.internal.util.FunctionalUtils;
		import com.android.telephony.Rlog;

		@@ -414,7 +412,6 @@ public abstract class DataService extends Service {
		* @param resultCodeCallback Listener for the {@link DataServiceCallback.ResultCode} that
		* request validation to the DataService and checks if the request has been submitted.
		*/
		@FlaggedApi(Flags.FLAG_NETWORK_VALIDATION)
		public void requestNetworkValidation(int cid,
		@NonNull @CallbackExecutor Executor executor,
		@NonNull @DataServiceCallback.ResultCode Consumer<Integer> resultCodeCallback) {