Merge "Deprecate CDMA" into main (96e60c6d) · Commits · e / os / android_hardware_interfaces

radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataCallFailCause.aidl

+45 −0

Original line number	Diff line number	Diff line
		@@ -192,11 +192,29 @@ enum DataCallFailCause {
		NON_IP_NOT_SUPPORTED = 0x815,
		PDN_NON_IP_CALL_THROTTLED = 0x816,
		PDN_NON_IP_CALL_DISALLOWED = 0x817,
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		CDMA_LOCK = 0x818,
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		CDMA_INTERCEPT = 0x819,
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		CDMA_REORDER = 0x81A,
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		CDMA_RELEASE_DUE_TO_SO_REJECTION = 0x81B,
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		CDMA_INCOMING_CALL = 0x81C,
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		CDMA_ALERT_STOP = 0x81D,
		CHANNEL_ACQUISITION_FAILURE = 0x81E,
		MAX_ACCESS_PROBE = 0x81F,
		@@ -204,8 +222,14 @@ enum DataCallFailCause {
		NO_RESPONSE_FROM_BASE_STATION = 0x821,
		REJECTED_BY_BASE_STATION = 0x822,
		CONCURRENT_SERVICES_INCOMPATIBLE = 0x823,
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		NO_CDMA_SERVICE = 0x824,
		RUIM_NOT_PRESENT = 0x825,
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		CDMA_RETRY_ORDER = 0x826,
		ACCESS_BLOCK = 0x827,
		ACCESS_BLOCK_ALL = 0x828,
		@@ -324,12 +348,33 @@ enum DataCallFailCause {
		LOWER_LAYER_REGISTRATION_FAILURE = 0x895,
		DATA_PLAN_EXPIRED = 0x896,
		UMTS_HANDOVER_TO_IWLAN = 0x897,
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		EVDO_CONNECTION_DENY_BY_GENERAL_OR_NETWORK_BUSY = 0x898,
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		EVDO_CONNECTION_DENY_BY_BILLING_OR_AUTHENTICATION_FAILURE = 0x899,
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		EVDO_HDR_CHANGED = 0x89A,
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		EVDO_HDR_EXITED = 0x89B,
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		EVDO_HDR_NO_SESSION = 0x89C,
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		EVDO_USING_GPS_FIX_INSTEAD_OF_HDR_CALL = 0x89D,
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		EVDO_HDR_CONNECTION_SETUP_TIMEOUT = 0x89E,
		FAILED_TO_ACQUIRE_COLOCATED_HDR = 0x89F,
		OTASP_COMMIT_IN_PROGRESS = 0x8A0,

radio/aidl/aidl_api/android.hardware.radio.messaging/current/android/hardware/radio/messaging/CdmaBroadcastSmsConfigInfo.aidl

+9 −0

Original line number	Diff line number	Diff line
		@@ -35,7 +35,16 @@ package android.hardware.radio.messaging;
		/* @hide */
		@JavaDerive(toString=true) @VintfStability
		parcelable CdmaBroadcastSmsConfigInfo {
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		int serviceCategory;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		int language;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		boolean selected;
		}

radio/aidl/aidl_api/android.hardware.radio.messaging/current/android/hardware/radio/messaging/CdmaSmsAck.aidl

+6 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,12 @@ package android.hardware.radio.messaging;
		/* @hide */
		@JavaDerive(toString=true) @VintfStability
		parcelable CdmaSmsAck {
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		boolean errorClass;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		int smsCauseCode;
		}

radio/aidl/aidl_api/android.hardware.radio.messaging/current/android/hardware/radio/messaging/CdmaSmsAddress.aidl

+93 −0

Original line number	Diff line number	Diff line
		@@ -35,35 +35,128 @@ package android.hardware.radio.messaging;
		/* @hide */
		@JavaDerive(toString=true) @VintfStability
		parcelable CdmaSmsAddress {
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		int digitMode;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		boolean isNumberModeDataNetwork;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		int numberType;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		int numberPlan;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		byte[] digits;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int DIGIT_MODE_FOUR_BIT = 0;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int DIGIT_MODE_EIGHT_BIT = 1;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_PLAN_UNKNOWN = 0;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_PLAN_TELEPHONY = 1;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_PLAN_RESERVED_2 = 2;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_PLAN_DATA = 3;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_PLAN_TELEX = 4;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_PLAN_RESERVED_5 = 5;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_PLAN_RESERVED_6 = 6;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_PLAN_RESERVED_7 = 7;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_PLAN_RESERVED_8 = 8;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_PLAN_PRIVATE = 9;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_PLAN_RESERVED_10 = 10;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_PLAN_RESERVED_11 = 11;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_PLAN_RESERVED_12 = 12;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_PLAN_RESERVED_13 = 13;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_PLAN_RESERVED_14 = 14;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_PLAN_RESERVED_15 = 15;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_TYPE_UNKNOWN = 0;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_TYPE_INTERNATIONAL_OR_DATA_IP = 1;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_TYPE_NATIONAL_OR_INTERNET_MAIL = 2;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_TYPE_NETWORK = 3;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_TYPE_SUBSCRIBER = 4;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_TYPE_ALPHANUMERIC = 5;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_TYPE_ABBREVIATED = 6;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		const int NUMBER_TYPE_RESERVED_7 = 7;
		}

radio/aidl/aidl_api/android.hardware.radio.messaging/current/android/hardware/radio/messaging/CdmaSmsMessage.aidl

+18 −0

Original line number	Diff line number	Diff line
		@@ -35,10 +35,28 @@ package android.hardware.radio.messaging;
		/* @hide */
		@JavaDerive(toString=true) @VintfStability
		parcelable CdmaSmsMessage {
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		int teleserviceId;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		boolean isServicePresent;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		int serviceCategory;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		android.hardware.radio.messaging.CdmaSmsAddress address;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		android.hardware.radio.messaging.CdmaSmsSubaddress subAddress;
		/**
		* @deprecated Legacy CDMA is unsupported.
		*/
		byte[] bearerData;
		}