diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/ApnAuthType.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/ApnAuthType.aidl
index a33ad6e..86272c2 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/ApnAuthType.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/ApnAuthType.aidl
@@ -34,8 +34,8 @@
 package android.hardware.radio.data;
 @Backing(type="int") @JavaDerive(toString=true) @VintfStability
 enum ApnAuthType {
-  NO_PAP_NO_CHAP,
-  PAP_NO_CHAP,
-  NO_PAP_CHAP,
-  PAP_CHAP,
+  NO_PAP_NO_CHAP = 0,
+  PAP_NO_CHAP = 1,
+  NO_PAP_CHAP = 2,
+  PAP_CHAP = 3,
 }
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/ApnTypes.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/ApnTypes.aidl
index 45d22c8..1518a57 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/ApnTypes.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/ApnTypes.aidl
@@ -35,19 +35,19 @@
 @Backing(type="int") @JavaDerive(toString=true) @VintfStability
 enum ApnTypes {
   NONE = 0,
-  DEFAULT = (1 << 0),
-  MMS = (1 << 1),
-  SUPL = (1 << 2),
-  DUN = (1 << 3),
-  HIPRI = (1 << 4),
-  FOTA = (1 << 5),
-  IMS = (1 << 6),
-  CBS = (1 << 7),
-  IA = (1 << 8),
-  EMERGENCY = (1 << 9),
-  MCX = (1 << 10),
-  XCAP = (1 << 11),
-  VSIM = (1 << 12),
-  BIP = (1 << 13),
-  ENTERPRISE = (1 << 14),
+  DEFAULT = 1,
+  MMS = 2,
+  SUPL = 4,
+  DUN = 8,
+  HIPRI = 16,
+  FOTA = 32,
+  IMS = 64,
+  CBS = 128,
+  IA = 256,
+  EMERGENCY = 512,
+  MCX = 1024,
+  XCAP = 2048,
+  VSIM = 4096,
+  BIP = 8192,
+  ENTERPRISE = 16384,
 }
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataCallFailCause.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataCallFailCause.aidl
index 0a5f8dd..d7d6983 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataCallFailCause.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataCallFailCause.aidl
@@ -35,343 +35,343 @@
 @Backing(type="int") @JavaDerive(toString=true) @VintfStability
 enum DataCallFailCause {
   NONE = 0,
-  OPERATOR_BARRED = 0x08,
-  NAS_SIGNALLING = 0x0E,
-  INSUFFICIENT_RESOURCES = 0x1A,
-  MISSING_UNKNOWN_APN = 0x1B,
-  UNKNOWN_PDP_ADDRESS_TYPE = 0x1C,
-  USER_AUTHENTICATION = 0x1D,
-  ACTIVATION_REJECT_GGSN = 0x1E,
-  ACTIVATION_REJECT_UNSPECIFIED = 0x1F,
-  SERVICE_OPTION_NOT_SUPPORTED = 0x20,
-  SERVICE_OPTION_NOT_SUBSCRIBED = 0x21,
-  SERVICE_OPTION_OUT_OF_ORDER = 0x22,
-  NSAPI_IN_USE = 0x23,
-  REGULAR_DEACTIVATION = 0x24,
-  QOS_NOT_ACCEPTED = 0x25,
-  NETWORK_FAILURE = 0x26,
-  UMTS_REACTIVATION_REQ = 0x27,
-  FEATURE_NOT_SUPP = 0x28,
-  TFT_SEMANTIC_ERROR = 0x29,
-  TFT_SYTAX_ERROR = 0x2A,
-  UNKNOWN_PDP_CONTEXT = 0x2B,
-  FILTER_SEMANTIC_ERROR = 0x2C,
-  FILTER_SYTAX_ERROR = 0x2D,
-  PDP_WITHOUT_ACTIVE_TFT = 0x2E,
-  ONLY_IPV4_ALLOWED = 0x32,
-  ONLY_IPV6_ALLOWED = 0x33,
-  ONLY_SINGLE_BEARER_ALLOWED = 0x34,
-  ESM_INFO_NOT_RECEIVED = 0x35,
-  PDN_CONN_DOES_NOT_EXIST = 0x36,
-  MULTI_CONN_TO_SAME_PDN_NOT_ALLOWED = 0x37,
-  MAX_ACTIVE_PDP_CONTEXT_REACHED = 0x41,
-  UNSUPPORTED_APN_IN_CURRENT_PLMN = 0x42,
-  INVALID_TRANSACTION_ID = 0x51,
-  MESSAGE_INCORRECT_SEMANTIC = 0x5F,
-  INVALID_MANDATORY_INFO = 0x60,
-  MESSAGE_TYPE_UNSUPPORTED = 0x61,
-  MSG_TYPE_NONCOMPATIBLE_STATE = 0x62,
-  UNKNOWN_INFO_ELEMENT = 0x63,
-  CONDITIONAL_IE_ERROR = 0x64,
-  MSG_AND_PROTOCOL_STATE_UNCOMPATIBLE = 0x65,
-  PROTOCOL_ERRORS = 0x6F,
-  APN_TYPE_CONFLICT = 0x70,
-  INVALID_PCSCF_ADDR = 0x71,
-  INTERNAL_CALL_PREEMPT_BY_HIGH_PRIO_APN = 0x72,
-  EMM_ACCESS_BARRED = 0x73,
-  EMERGENCY_IFACE_ONLY = 0x74,
-  IFACE_MISMATCH = 0x75,
-  COMPANION_IFACE_IN_USE = 0x76,
-  IP_ADDRESS_MISMATCH = 0x77,
-  IFACE_AND_POL_FAMILY_MISMATCH = 0x78,
-  EMM_ACCESS_BARRED_INFINITE_RETRY = 0x79,
-  AUTH_FAILURE_ON_EMERGENCY_CALL = 0x7A,
-  OEM_DCFAILCAUSE_1 = 0x1001,
-  OEM_DCFAILCAUSE_2 = 0x1002,
-  OEM_DCFAILCAUSE_3 = 0x1003,
-  OEM_DCFAILCAUSE_4 = 0x1004,
-  OEM_DCFAILCAUSE_5 = 0x1005,
-  OEM_DCFAILCAUSE_6 = 0x1006,
-  OEM_DCFAILCAUSE_7 = 0x1007,
-  OEM_DCFAILCAUSE_8 = 0x1008,
-  OEM_DCFAILCAUSE_9 = 0x1009,
-  OEM_DCFAILCAUSE_10 = 0x100A,
-  OEM_DCFAILCAUSE_11 = 0x100B,
-  OEM_DCFAILCAUSE_12 = 0x100C,
-  OEM_DCFAILCAUSE_13 = 0x100D,
-  OEM_DCFAILCAUSE_14 = 0x100E,
-  OEM_DCFAILCAUSE_15 = 0x100F,
-  VOICE_REGISTRATION_FAIL = (-1),
-  DATA_REGISTRATION_FAIL = (-2),
-  SIGNAL_LOST = (-3),
-  PREF_RADIO_TECH_CHANGED = (-4),
-  RADIO_POWER_OFF = (-5),
-  TETHERED_CALL_ACTIVE = (-6),
-  ERROR_UNSPECIFIED = 0xffff,
-  LLC_SNDCP = 0x19,
-  ACTIVATION_REJECTED_BCM_VIOLATION = 0x30,
-  COLLISION_WITH_NETWORK_INITIATED_REQUEST = 0x38,
-  ONLY_IPV4V6_ALLOWED = 0x39,
-  ONLY_NON_IP_ALLOWED = 0x3A,
-  UNSUPPORTED_QCI_VALUE = 0x3B,
-  BEARER_HANDLING_NOT_SUPPORTED = 0x3C,
-  INVALID_DNS_ADDR = 0x7B,
-  INVALID_PCSCF_OR_DNS_ADDRESS = 0x7C,
-  CALL_PREEMPT_BY_EMERGENCY_APN = 0x7F,
-  UE_INITIATED_DETACH_OR_DISCONNECT = 0x80,
-  MIP_FA_REASON_UNSPECIFIED = 0x7D0,
-  MIP_FA_ADMIN_PROHIBITED = 0x7D1,
-  MIP_FA_INSUFFICIENT_RESOURCES = 0x7D2,
-  MIP_FA_MOBILE_NODE_AUTHENTICATION_FAILURE = 0x7D3,
-  MIP_FA_HOME_AGENT_AUTHENTICATION_FAILURE = 0x7D4,
-  MIP_FA_REQUESTED_LIFETIME_TOO_LONG = 0x7D5,
-  MIP_FA_MALFORMED_REQUEST = 0x7D6,
-  MIP_FA_MALFORMED_REPLY = 0x7D7,
-  MIP_FA_ENCAPSULATION_UNAVAILABLE = 0x7D8,
-  MIP_FA_VJ_HEADER_COMPRESSION_UNAVAILABLE = 0x7D9,
-  MIP_FA_REVERSE_TUNNEL_UNAVAILABLE = 0x7DA,
-  MIP_FA_REVERSE_TUNNEL_IS_MANDATORY = 0x7DB,
-  MIP_FA_DELIVERY_STYLE_NOT_SUPPORTED = 0x7DC,
-  MIP_FA_MISSING_NAI = 0x7DD,
-  MIP_FA_MISSING_HOME_AGENT = 0x7DE,
-  MIP_FA_MISSING_HOME_ADDRESS = 0x7DF,
-  MIP_FA_UNKNOWN_CHALLENGE = 0x7E0,
-  MIP_FA_MISSING_CHALLENGE = 0x7E1,
-  MIP_FA_STALE_CHALLENGE = 0x7E2,
-  MIP_HA_REASON_UNSPECIFIED = 0x7E3,
-  MIP_HA_ADMIN_PROHIBITED = 0x7E4,
-  MIP_HA_INSUFFICIENT_RESOURCES = 0x7E5,
-  MIP_HA_MOBILE_NODE_AUTHENTICATION_FAILURE = 0x7E6,
-  MIP_HA_FOREIGN_AGENT_AUTHENTICATION_FAILURE = 0x7E7,
-  MIP_HA_REGISTRATION_ID_MISMATCH = 0x7E8,
-  MIP_HA_MALFORMED_REQUEST = 0x7E9,
-  MIP_HA_UNKNOWN_HOME_AGENT_ADDRESS = 0x7EA,
-  MIP_HA_REVERSE_TUNNEL_UNAVAILABLE = 0x7EB,
-  MIP_HA_REVERSE_TUNNEL_IS_MANDATORY = 0x7EC,
-  MIP_HA_ENCAPSULATION_UNAVAILABLE = 0x7ED,
-  CLOSE_IN_PROGRESS = 0x7EE,
-  NETWORK_INITIATED_TERMINATION = 0x7EF,
-  MODEM_APP_PREEMPTED = 0x7F0,
-  PDN_IPV4_CALL_DISALLOWED = 0x7F1,
-  PDN_IPV4_CALL_THROTTLED = 0x7F2,
-  PDN_IPV6_CALL_DISALLOWED = 0x7F3,
-  PDN_IPV6_CALL_THROTTLED = 0x7F4,
-  MODEM_RESTART = 0x7F5,
-  PDP_PPP_NOT_SUPPORTED = 0x7F6,
-  UNPREFERRED_RAT = 0x7F7,
-  PHYSICAL_LINK_CLOSE_IN_PROGRESS = 0x7F8,
-  APN_PENDING_HANDOVER = 0x7F9,
-  PROFILE_BEARER_INCOMPATIBLE = 0x7FA,
-  SIM_CARD_CHANGED = 0x7FB,
-  LOW_POWER_MODE_OR_POWERING_DOWN = 0x7FC,
-  APN_DISABLED = 0x7FD,
-  MAX_PPP_INACTIVITY_TIMER_EXPIRED = 0x7FE,
-  IPV6_ADDRESS_TRANSFER_FAILED = 0x7FF,
-  TRAT_SWAP_FAILED = 0x800,
-  EHRPD_TO_HRPD_FALLBACK = 0x801,
-  MIP_CONFIG_FAILURE = 0x802,
-  PDN_INACTIVITY_TIMER_EXPIRED = 0x803,
-  MAX_IPV4_CONNECTIONS = 0x804,
-  MAX_IPV6_CONNECTIONS = 0x805,
-  APN_MISMATCH = 0x806,
-  IP_VERSION_MISMATCH = 0x807,
-  DUN_CALL_DISALLOWED = 0x808,
-  INTERNAL_EPC_NONEPC_TRANSITION = 0x809,
-  INTERFACE_IN_USE = 0x80A,
-  APN_DISALLOWED_ON_ROAMING = 0x80B,
-  APN_PARAMETERS_CHANGED = 0x80C,
-  NULL_APN_DISALLOWED = 0x80D,
-  THERMAL_MITIGATION = 0x80E,
-  DATA_SETTINGS_DISABLED = 0x80F,
-  DATA_ROAMING_SETTINGS_DISABLED = 0x810,
-  DDS_SWITCHED = 0x811,
-  FORBIDDEN_APN_NAME = 0x812,
-  DDS_SWITCH_IN_PROGRESS = 0x813,
-  CALL_DISALLOWED_IN_ROAMING = 0x814,
-  NON_IP_NOT_SUPPORTED = 0x815,
-  PDN_NON_IP_CALL_THROTTLED = 0x816,
-  PDN_NON_IP_CALL_DISALLOWED = 0x817,
-  CDMA_LOCK = 0x818,
-  CDMA_INTERCEPT = 0x819,
-  CDMA_REORDER = 0x81A,
-  CDMA_RELEASE_DUE_TO_SO_REJECTION = 0x81B,
-  CDMA_INCOMING_CALL = 0x81C,
-  CDMA_ALERT_STOP = 0x81D,
-  CHANNEL_ACQUISITION_FAILURE = 0x81E,
-  MAX_ACCESS_PROBE = 0x81F,
-  CONCURRENT_SERVICE_NOT_SUPPORTED_BY_BASE_STATION = 0x820,
-  NO_RESPONSE_FROM_BASE_STATION = 0x821,
-  REJECTED_BY_BASE_STATION = 0x822,
-  CONCURRENT_SERVICES_INCOMPATIBLE = 0x823,
-  NO_CDMA_SERVICE = 0x824,
-  RUIM_NOT_PRESENT = 0x825,
-  CDMA_RETRY_ORDER = 0x826,
-  ACCESS_BLOCK = 0x827,
-  ACCESS_BLOCK_ALL = 0x828,
-  IS707B_MAX_ACCESS_PROBES = 0x829,
-  THERMAL_EMERGENCY = 0x82A,
-  CONCURRENT_SERVICES_NOT_ALLOWED = 0x82B,
-  INCOMING_CALL_REJECTED = 0x82C,
-  NO_SERVICE_ON_GATEWAY = 0x82D,
-  NO_GPRS_CONTEXT = 0x82E,
-  ILLEGAL_MS = 0x82F,
-  ILLEGAL_ME = 0x830,
-  GPRS_SERVICES_AND_NON_GPRS_SERVICES_NOT_ALLOWED = 0x831,
-  GPRS_SERVICES_NOT_ALLOWED = 0x832,
-  MS_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK = 0x833,
-  IMPLICITLY_DETACHED = 0x834,
-  PLMN_NOT_ALLOWED = 0x835,
-  LOCATION_AREA_NOT_ALLOWED = 0x836,
-  GPRS_SERVICES_NOT_ALLOWED_IN_THIS_PLMN = 0x837,
-  PDP_DUPLICATE = 0x838,
-  UE_RAT_CHANGE = 0x839,
-  CONGESTION = 0x83A,
-  NO_PDP_CONTEXT_ACTIVATED = 0x83B,
-  ACCESS_CLASS_DSAC_REJECTION = 0x83C,
-  PDP_ACTIVATE_MAX_RETRY_FAILED = 0x83D,
-  RADIO_ACCESS_BEARER_FAILURE = 0x83E,
-  ESM_UNKNOWN_EPS_BEARER_CONTEXT = 0x83F,
-  DRB_RELEASED_BY_RRC = 0x840,
-  CONNECTION_RELEASED = 0x841,
-  EMM_DETACHED = 0x842,
-  EMM_ATTACH_FAILED = 0x843,
-  EMM_ATTACH_STARTED = 0x844,
-  LTE_NAS_SERVICE_REQUEST_FAILED = 0x845,
-  DUPLICATE_BEARER_ID = 0x846,
-  ESM_COLLISION_SCENARIOS = 0x847,
-  ESM_BEARER_DEACTIVATED_TO_SYNC_WITH_NETWORK = 0x848,
-  ESM_NW_ACTIVATED_DED_BEARER_WITH_ID_OF_DEF_BEARER = 0x849,
-  ESM_BAD_OTA_MESSAGE = 0x84A,
-  ESM_DOWNLOAD_SERVER_REJECTED_THE_CALL = 0x84B,
-  ESM_CONTEXT_TRANSFERRED_DUE_TO_IRAT = 0x84C,
-  DS_EXPLICIT_DEACTIVATION = 0x84D,
-  ESM_LOCAL_CAUSE_NONE = 0x84E,
-  LTE_THROTTLING_NOT_REQUIRED = 0x84F,
-  ACCESS_CONTROL_LIST_CHECK_FAILURE = 0x850,
-  SERVICE_NOT_ALLOWED_ON_PLMN = 0x851,
-  EMM_T3417_EXPIRED = 0x852,
-  EMM_T3417_EXT_EXPIRED = 0x853,
-  RRC_UPLINK_DATA_TRANSMISSION_FAILURE = 0x854,
-  RRC_UPLINK_DELIVERY_FAILED_DUE_TO_HANDOVER = 0x855,
-  RRC_UPLINK_CONNECTION_RELEASE = 0x856,
-  RRC_UPLINK_RADIO_LINK_FAILURE = 0x857,
-  RRC_UPLINK_ERROR_REQUEST_FROM_NAS = 0x858,
-  RRC_CONNECTION_ACCESS_STRATUM_FAILURE = 0x859,
-  RRC_CONNECTION_ANOTHER_PROCEDURE_IN_PROGRESS = 0x85A,
-  RRC_CONNECTION_ACCESS_BARRED = 0x85B,
-  RRC_CONNECTION_CELL_RESELECTION = 0x85C,
-  RRC_CONNECTION_CONFIG_FAILURE = 0x85D,
-  RRC_CONNECTION_TIMER_EXPIRED = 0x85E,
-  RRC_CONNECTION_LINK_FAILURE = 0x85F,
-  RRC_CONNECTION_CELL_NOT_CAMPED = 0x860,
-  RRC_CONNECTION_SYSTEM_INTERVAL_FAILURE = 0x861,
-  RRC_CONNECTION_REJECT_BY_NETWORK = 0x862,
-  RRC_CONNECTION_NORMAL_RELEASE = 0x863,
-  RRC_CONNECTION_RADIO_LINK_FAILURE = 0x864,
-  RRC_CONNECTION_REESTABLISHMENT_FAILURE = 0x865,
-  RRC_CONNECTION_OUT_OF_SERVICE_DURING_CELL_REGISTER = 0x866,
-  RRC_CONNECTION_ABORT_REQUEST = 0x867,
-  RRC_CONNECTION_SYSTEM_INFORMATION_BLOCK_READ_ERROR = 0x868,
-  NETWORK_INITIATED_DETACH_WITH_AUTO_REATTACH = 0x869,
-  NETWORK_INITIATED_DETACH_NO_AUTO_REATTACH = 0x86A,
-  ESM_PROCEDURE_TIME_OUT = 0x86B,
-  INVALID_CONNECTION_ID = 0x86C,
-  MAXIMIUM_NSAPIS_EXCEEDED = 0x86D,
-  INVALID_PRIMARY_NSAPI = 0x86E,
-  CANNOT_ENCODE_OTA_MESSAGE = 0x86F,
-  RADIO_ACCESS_BEARER_SETUP_FAILURE = 0x870,
-  PDP_ESTABLISH_TIMEOUT_EXPIRED = 0x871,
-  PDP_MODIFY_TIMEOUT_EXPIRED = 0x872,
-  PDP_INACTIVE_TIMEOUT_EXPIRED = 0x873,
-  PDP_LOWERLAYER_ERROR = 0x874,
-  PDP_MODIFY_COLLISION = 0x875,
-  MAXINUM_SIZE_OF_L2_MESSAGE_EXCEEDED = 0x876,
-  NAS_REQUEST_REJECTED_BY_NETWORK = 0x877,
-  RRC_CONNECTION_INVALID_REQUEST = 0x878,
-  RRC_CONNECTION_TRACKING_AREA_ID_CHANGED = 0x879,
-  RRC_CONNECTION_RF_UNAVAILABLE = 0x87A,
-  RRC_CONNECTION_ABORTED_DUE_TO_IRAT_CHANGE = 0x87B,
-  RRC_CONNECTION_RELEASED_SECURITY_NOT_ACTIVE = 0x87C,
-  RRC_CONNECTION_ABORTED_AFTER_HANDOVER = 0x87D,
-  RRC_CONNECTION_ABORTED_AFTER_IRAT_CELL_CHANGE = 0x87E,
-  RRC_CONNECTION_ABORTED_DURING_IRAT_CELL_CHANGE = 0x87F,
-  IMSI_UNKNOWN_IN_HOME_SUBSCRIBER_SERVER = 0x880,
-  IMEI_NOT_ACCEPTED = 0x881,
-  EPS_SERVICES_AND_NON_EPS_SERVICES_NOT_ALLOWED = 0x882,
-  EPS_SERVICES_NOT_ALLOWED_IN_PLMN = 0x883,
-  MSC_TEMPORARILY_NOT_REACHABLE = 0x884,
-  CS_DOMAIN_NOT_AVAILABLE = 0x885,
-  ESM_FAILURE = 0x886,
-  MAC_FAILURE = 0x887,
-  SYNCHRONIZATION_FAILURE = 0x888,
-  UE_SECURITY_CAPABILITIES_MISMATCH = 0x889,
-  SECURITY_MODE_REJECTED = 0x88A,
-  UNACCEPTABLE_NON_EPS_AUTHENTICATION = 0x88B,
-  CS_FALLBACK_CALL_ESTABLISHMENT_NOT_ALLOWED = 0x88C,
-  NO_EPS_BEARER_CONTEXT_ACTIVATED = 0x88D,
-  INVALID_EMM_STATE = 0x88E,
-  NAS_LAYER_FAILURE = 0x88F,
-  MULTIPLE_PDP_CALL_NOT_ALLOWED = 0x890,
-  EMBMS_NOT_ENABLED = 0x891,
-  IRAT_HANDOVER_FAILED = 0x892,
-  EMBMS_REGULAR_DEACTIVATION = 0x893,
-  TEST_LOOPBACK_REGULAR_DEACTIVATION = 0x894,
-  LOWER_LAYER_REGISTRATION_FAILURE = 0x895,
-  DATA_PLAN_EXPIRED = 0x896,
-  UMTS_HANDOVER_TO_IWLAN = 0x897,
-  EVDO_CONNECTION_DENY_BY_GENERAL_OR_NETWORK_BUSY = 0x898,
-  EVDO_CONNECTION_DENY_BY_BILLING_OR_AUTHENTICATION_FAILURE = 0x899,
-  EVDO_HDR_CHANGED = 0x89A,
-  EVDO_HDR_EXITED = 0x89B,
-  EVDO_HDR_NO_SESSION = 0x89C,
-  EVDO_USING_GPS_FIX_INSTEAD_OF_HDR_CALL = 0x89D,
-  EVDO_HDR_CONNECTION_SETUP_TIMEOUT = 0x89E,
-  FAILED_TO_ACQUIRE_COLOCATED_HDR = 0x89F,
-  OTASP_COMMIT_IN_PROGRESS = 0x8A0,
-  NO_HYBRID_HDR_SERVICE = 0x8A1,
-  HDR_NO_LOCK_GRANTED = 0x8A2,
-  DBM_OR_SMS_IN_PROGRESS = 0x8A3,
-  HDR_FADE = 0x8A4,
-  HDR_ACCESS_FAILURE = 0x8A5,
-  UNSUPPORTED_1X_PREV = 0x8A6,
-  LOCAL_END = 0x8A7,
-  NO_SERVICE = 0x8A8,
-  FADE = 0x8A9,
-  NORMAL_RELEASE = 0x8AA,
-  ACCESS_ATTEMPT_ALREADY_IN_PROGRESS = 0x8AB,
-  REDIRECTION_OR_HANDOFF_IN_PROGRESS = 0x8AC,
-  EMERGENCY_MODE = 0x8AD,
-  PHONE_IN_USE = 0x8AE,
-  INVALID_MODE = 0x8AF,
-  INVALID_SIM_STATE = 0x8B0,
-  NO_COLLOCATED_HDR = 0x8B1,
-  UE_IS_ENTERING_POWERSAVE_MODE = 0x8B2,
-  DUAL_SWITCH = 0x8B3,
-  PPP_TIMEOUT = 0x8B4,
-  PPP_AUTH_FAILURE = 0x8B5,
-  PPP_OPTION_MISMATCH = 0x8B6,
-  PPP_PAP_FAILURE = 0x8B7,
-  PPP_CHAP_FAILURE = 0x8B8,
-  PPP_CLOSE_IN_PROGRESS = 0x8B9,
-  LIMITED_TO_IPV4 = 0x8BA,
-  LIMITED_TO_IPV6 = 0x8BB,
-  VSNCP_TIMEOUT = 0x8BC,
-  VSNCP_GEN_ERROR = 0x8BD,
-  VSNCP_APN_UNAUTHORIZED = 0x8BE,
-  VSNCP_PDN_LIMIT_EXCEEDED = 0x8BF,
-  VSNCP_NO_PDN_GATEWAY_ADDRESS = 0x8C0,
-  VSNCP_PDN_GATEWAY_UNREACHABLE = 0x8C1,
-  VSNCP_PDN_GATEWAY_REJECT = 0x8C2,
-  VSNCP_INSUFFICIENT_PARAMETERS = 0x8C3,
-  VSNCP_RESOURCE_UNAVAILABLE = 0x8C4,
-  VSNCP_ADMINISTRATIVELY_PROHIBITED = 0x8C5,
-  VSNCP_PDN_ID_IN_USE = 0x8C6,
-  VSNCP_SUBSCRIBER_LIMITATION = 0x8C7,
-  VSNCP_PDN_EXISTS_FOR_THIS_APN = 0x8C8,
-  VSNCP_RECONNECT_NOT_ALLOWED = 0x8C9,
-  IPV6_PREFIX_UNAVAILABLE = 0x8CA,
-  HANDOFF_PREFERENCE_CHANGED = 0x8CB,
-  SLICE_REJECTED = 0x8CC,
-  MATCH_ALL_RULE_NOT_ALLOWED = 0x8CD,
-  ALL_MATCHING_RULES_FAILED = 0x8CE,
+  OPERATOR_BARRED = 8,
+  NAS_SIGNALLING = 14,
+  INSUFFICIENT_RESOURCES = 26,
+  MISSING_UNKNOWN_APN = 27,
+  UNKNOWN_PDP_ADDRESS_TYPE = 28,
+  USER_AUTHENTICATION = 29,
+  ACTIVATION_REJECT_GGSN = 30,
+  ACTIVATION_REJECT_UNSPECIFIED = 31,
+  SERVICE_OPTION_NOT_SUPPORTED = 32,
+  SERVICE_OPTION_NOT_SUBSCRIBED = 33,
+  SERVICE_OPTION_OUT_OF_ORDER = 34,
+  NSAPI_IN_USE = 35,
+  REGULAR_DEACTIVATION = 36,
+  QOS_NOT_ACCEPTED = 37,
+  NETWORK_FAILURE = 38,
+  UMTS_REACTIVATION_REQ = 39,
+  FEATURE_NOT_SUPP = 40,
+  TFT_SEMANTIC_ERROR = 41,
+  TFT_SYTAX_ERROR = 42,
+  UNKNOWN_PDP_CONTEXT = 43,
+  FILTER_SEMANTIC_ERROR = 44,
+  FILTER_SYTAX_ERROR = 45,
+  PDP_WITHOUT_ACTIVE_TFT = 46,
+  ONLY_IPV4_ALLOWED = 50,
+  ONLY_IPV6_ALLOWED = 51,
+  ONLY_SINGLE_BEARER_ALLOWED = 52,
+  ESM_INFO_NOT_RECEIVED = 53,
+  PDN_CONN_DOES_NOT_EXIST = 54,
+  MULTI_CONN_TO_SAME_PDN_NOT_ALLOWED = 55,
+  MAX_ACTIVE_PDP_CONTEXT_REACHED = 65,
+  UNSUPPORTED_APN_IN_CURRENT_PLMN = 66,
+  INVALID_TRANSACTION_ID = 81,
+  MESSAGE_INCORRECT_SEMANTIC = 95,
+  INVALID_MANDATORY_INFO = 96,
+  MESSAGE_TYPE_UNSUPPORTED = 97,
+  MSG_TYPE_NONCOMPATIBLE_STATE = 98,
+  UNKNOWN_INFO_ELEMENT = 99,
+  CONDITIONAL_IE_ERROR = 100,
+  MSG_AND_PROTOCOL_STATE_UNCOMPATIBLE = 101,
+  PROTOCOL_ERRORS = 111,
+  APN_TYPE_CONFLICT = 112,
+  INVALID_PCSCF_ADDR = 113,
+  INTERNAL_CALL_PREEMPT_BY_HIGH_PRIO_APN = 114,
+  EMM_ACCESS_BARRED = 115,
+  EMERGENCY_IFACE_ONLY = 116,
+  IFACE_MISMATCH = 117,
+  COMPANION_IFACE_IN_USE = 118,
+  IP_ADDRESS_MISMATCH = 119,
+  IFACE_AND_POL_FAMILY_MISMATCH = 120,
+  EMM_ACCESS_BARRED_INFINITE_RETRY = 121,
+  AUTH_FAILURE_ON_EMERGENCY_CALL = 122,
+  OEM_DCFAILCAUSE_1 = 4097,
+  OEM_DCFAILCAUSE_2 = 4098,
+  OEM_DCFAILCAUSE_3 = 4099,
+  OEM_DCFAILCAUSE_4 = 4100,
+  OEM_DCFAILCAUSE_5 = 4101,
+  OEM_DCFAILCAUSE_6 = 4102,
+  OEM_DCFAILCAUSE_7 = 4103,
+  OEM_DCFAILCAUSE_8 = 4104,
+  OEM_DCFAILCAUSE_9 = 4105,
+  OEM_DCFAILCAUSE_10 = 4106,
+  OEM_DCFAILCAUSE_11 = 4107,
+  OEM_DCFAILCAUSE_12 = 4108,
+  OEM_DCFAILCAUSE_13 = 4109,
+  OEM_DCFAILCAUSE_14 = 4110,
+  OEM_DCFAILCAUSE_15 = 4111,
+  VOICE_REGISTRATION_FAIL = -1,
+  DATA_REGISTRATION_FAIL = -2,
+  SIGNAL_LOST = -3,
+  PREF_RADIO_TECH_CHANGED = -4,
+  RADIO_POWER_OFF = -5,
+  TETHERED_CALL_ACTIVE = -6,
+  ERROR_UNSPECIFIED = 65535,
+  LLC_SNDCP = 25,
+  ACTIVATION_REJECTED_BCM_VIOLATION = 48,
+  COLLISION_WITH_NETWORK_INITIATED_REQUEST = 56,
+  ONLY_IPV4V6_ALLOWED = 57,
+  ONLY_NON_IP_ALLOWED = 58,
+  UNSUPPORTED_QCI_VALUE = 59,
+  BEARER_HANDLING_NOT_SUPPORTED = 60,
+  INVALID_DNS_ADDR = 123,
+  INVALID_PCSCF_OR_DNS_ADDRESS = 124,
+  CALL_PREEMPT_BY_EMERGENCY_APN = 127,
+  UE_INITIATED_DETACH_OR_DISCONNECT = 128,
+  MIP_FA_REASON_UNSPECIFIED = 2000,
+  MIP_FA_ADMIN_PROHIBITED = 2001,
+  MIP_FA_INSUFFICIENT_RESOURCES = 2002,
+  MIP_FA_MOBILE_NODE_AUTHENTICATION_FAILURE = 2003,
+  MIP_FA_HOME_AGENT_AUTHENTICATION_FAILURE = 2004,
+  MIP_FA_REQUESTED_LIFETIME_TOO_LONG = 2005,
+  MIP_FA_MALFORMED_REQUEST = 2006,
+  MIP_FA_MALFORMED_REPLY = 2007,
+  MIP_FA_ENCAPSULATION_UNAVAILABLE = 2008,
+  MIP_FA_VJ_HEADER_COMPRESSION_UNAVAILABLE = 2009,
+  MIP_FA_REVERSE_TUNNEL_UNAVAILABLE = 2010,
+  MIP_FA_REVERSE_TUNNEL_IS_MANDATORY = 2011,
+  MIP_FA_DELIVERY_STYLE_NOT_SUPPORTED = 2012,
+  MIP_FA_MISSING_NAI = 2013,
+  MIP_FA_MISSING_HOME_AGENT = 2014,
+  MIP_FA_MISSING_HOME_ADDRESS = 2015,
+  MIP_FA_UNKNOWN_CHALLENGE = 2016,
+  MIP_FA_MISSING_CHALLENGE = 2017,
+  MIP_FA_STALE_CHALLENGE = 2018,
+  MIP_HA_REASON_UNSPECIFIED = 2019,
+  MIP_HA_ADMIN_PROHIBITED = 2020,
+  MIP_HA_INSUFFICIENT_RESOURCES = 2021,
+  MIP_HA_MOBILE_NODE_AUTHENTICATION_FAILURE = 2022,
+  MIP_HA_FOREIGN_AGENT_AUTHENTICATION_FAILURE = 2023,
+  MIP_HA_REGISTRATION_ID_MISMATCH = 2024,
+  MIP_HA_MALFORMED_REQUEST = 2025,
+  MIP_HA_UNKNOWN_HOME_AGENT_ADDRESS = 2026,
+  MIP_HA_REVERSE_TUNNEL_UNAVAILABLE = 2027,
+  MIP_HA_REVERSE_TUNNEL_IS_MANDATORY = 2028,
+  MIP_HA_ENCAPSULATION_UNAVAILABLE = 2029,
+  CLOSE_IN_PROGRESS = 2030,
+  NETWORK_INITIATED_TERMINATION = 2031,
+  MODEM_APP_PREEMPTED = 2032,
+  PDN_IPV4_CALL_DISALLOWED = 2033,
+  PDN_IPV4_CALL_THROTTLED = 2034,
+  PDN_IPV6_CALL_DISALLOWED = 2035,
+  PDN_IPV6_CALL_THROTTLED = 2036,
+  MODEM_RESTART = 2037,
+  PDP_PPP_NOT_SUPPORTED = 2038,
+  UNPREFERRED_RAT = 2039,
+  PHYSICAL_LINK_CLOSE_IN_PROGRESS = 2040,
+  APN_PENDING_HANDOVER = 2041,
+  PROFILE_BEARER_INCOMPATIBLE = 2042,
+  SIM_CARD_CHANGED = 2043,
+  LOW_POWER_MODE_OR_POWERING_DOWN = 2044,
+  APN_DISABLED = 2045,
+  MAX_PPP_INACTIVITY_TIMER_EXPIRED = 2046,
+  IPV6_ADDRESS_TRANSFER_FAILED = 2047,
+  TRAT_SWAP_FAILED = 2048,
+  EHRPD_TO_HRPD_FALLBACK = 2049,
+  MIP_CONFIG_FAILURE = 2050,
+  PDN_INACTIVITY_TIMER_EXPIRED = 2051,
+  MAX_IPV4_CONNECTIONS = 2052,
+  MAX_IPV6_CONNECTIONS = 2053,
+  APN_MISMATCH = 2054,
+  IP_VERSION_MISMATCH = 2055,
+  DUN_CALL_DISALLOWED = 2056,
+  INTERNAL_EPC_NONEPC_TRANSITION = 2057,
+  INTERFACE_IN_USE = 2058,
+  APN_DISALLOWED_ON_ROAMING = 2059,
+  APN_PARAMETERS_CHANGED = 2060,
+  NULL_APN_DISALLOWED = 2061,
+  THERMAL_MITIGATION = 2062,
+  DATA_SETTINGS_DISABLED = 2063,
+  DATA_ROAMING_SETTINGS_DISABLED = 2064,
+  DDS_SWITCHED = 2065,
+  FORBIDDEN_APN_NAME = 2066,
+  DDS_SWITCH_IN_PROGRESS = 2067,
+  CALL_DISALLOWED_IN_ROAMING = 2068,
+  NON_IP_NOT_SUPPORTED = 2069,
+  PDN_NON_IP_CALL_THROTTLED = 2070,
+  PDN_NON_IP_CALL_DISALLOWED = 2071,
+  CDMA_LOCK = 2072,
+  CDMA_INTERCEPT = 2073,
+  CDMA_REORDER = 2074,
+  CDMA_RELEASE_DUE_TO_SO_REJECTION = 2075,
+  CDMA_INCOMING_CALL = 2076,
+  CDMA_ALERT_STOP = 2077,
+  CHANNEL_ACQUISITION_FAILURE = 2078,
+  MAX_ACCESS_PROBE = 2079,
+  CONCURRENT_SERVICE_NOT_SUPPORTED_BY_BASE_STATION = 2080,
+  NO_RESPONSE_FROM_BASE_STATION = 2081,
+  REJECTED_BY_BASE_STATION = 2082,
+  CONCURRENT_SERVICES_INCOMPATIBLE = 2083,
+  NO_CDMA_SERVICE = 2084,
+  RUIM_NOT_PRESENT = 2085,
+  CDMA_RETRY_ORDER = 2086,
+  ACCESS_BLOCK = 2087,
+  ACCESS_BLOCK_ALL = 2088,
+  IS707B_MAX_ACCESS_PROBES = 2089,
+  THERMAL_EMERGENCY = 2090,
+  CONCURRENT_SERVICES_NOT_ALLOWED = 2091,
+  INCOMING_CALL_REJECTED = 2092,
+  NO_SERVICE_ON_GATEWAY = 2093,
+  NO_GPRS_CONTEXT = 2094,
+  ILLEGAL_MS = 2095,
+  ILLEGAL_ME = 2096,
+  GPRS_SERVICES_AND_NON_GPRS_SERVICES_NOT_ALLOWED = 2097,
+  GPRS_SERVICES_NOT_ALLOWED = 2098,
+  MS_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK = 2099,
+  IMPLICITLY_DETACHED = 2100,
+  PLMN_NOT_ALLOWED = 2101,
+  LOCATION_AREA_NOT_ALLOWED = 2102,
+  GPRS_SERVICES_NOT_ALLOWED_IN_THIS_PLMN = 2103,
+  PDP_DUPLICATE = 2104,
+  UE_RAT_CHANGE = 2105,
+  CONGESTION = 2106,
+  NO_PDP_CONTEXT_ACTIVATED = 2107,
+  ACCESS_CLASS_DSAC_REJECTION = 2108,
+  PDP_ACTIVATE_MAX_RETRY_FAILED = 2109,
+  RADIO_ACCESS_BEARER_FAILURE = 2110,
+  ESM_UNKNOWN_EPS_BEARER_CONTEXT = 2111,
+  DRB_RELEASED_BY_RRC = 2112,
+  CONNECTION_RELEASED = 2113,
+  EMM_DETACHED = 2114,
+  EMM_ATTACH_FAILED = 2115,
+  EMM_ATTACH_STARTED = 2116,
+  LTE_NAS_SERVICE_REQUEST_FAILED = 2117,
+  DUPLICATE_BEARER_ID = 2118,
+  ESM_COLLISION_SCENARIOS = 2119,
+  ESM_BEARER_DEACTIVATED_TO_SYNC_WITH_NETWORK = 2120,
+  ESM_NW_ACTIVATED_DED_BEARER_WITH_ID_OF_DEF_BEARER = 2121,
+  ESM_BAD_OTA_MESSAGE = 2122,
+  ESM_DOWNLOAD_SERVER_REJECTED_THE_CALL = 2123,
+  ESM_CONTEXT_TRANSFERRED_DUE_TO_IRAT = 2124,
+  DS_EXPLICIT_DEACTIVATION = 2125,
+  ESM_LOCAL_CAUSE_NONE = 2126,
+  LTE_THROTTLING_NOT_REQUIRED = 2127,
+  ACCESS_CONTROL_LIST_CHECK_FAILURE = 2128,
+  SERVICE_NOT_ALLOWED_ON_PLMN = 2129,
+  EMM_T3417_EXPIRED = 2130,
+  EMM_T3417_EXT_EXPIRED = 2131,
+  RRC_UPLINK_DATA_TRANSMISSION_FAILURE = 2132,
+  RRC_UPLINK_DELIVERY_FAILED_DUE_TO_HANDOVER = 2133,
+  RRC_UPLINK_CONNECTION_RELEASE = 2134,
+  RRC_UPLINK_RADIO_LINK_FAILURE = 2135,
+  RRC_UPLINK_ERROR_REQUEST_FROM_NAS = 2136,
+  RRC_CONNECTION_ACCESS_STRATUM_FAILURE = 2137,
+  RRC_CONNECTION_ANOTHER_PROCEDURE_IN_PROGRESS = 2138,
+  RRC_CONNECTION_ACCESS_BARRED = 2139,
+  RRC_CONNECTION_CELL_RESELECTION = 2140,
+  RRC_CONNECTION_CONFIG_FAILURE = 2141,
+  RRC_CONNECTION_TIMER_EXPIRED = 2142,
+  RRC_CONNECTION_LINK_FAILURE = 2143,
+  RRC_CONNECTION_CELL_NOT_CAMPED = 2144,
+  RRC_CONNECTION_SYSTEM_INTERVAL_FAILURE = 2145,
+  RRC_CONNECTION_REJECT_BY_NETWORK = 2146,
+  RRC_CONNECTION_NORMAL_RELEASE = 2147,
+  RRC_CONNECTION_RADIO_LINK_FAILURE = 2148,
+  RRC_CONNECTION_REESTABLISHMENT_FAILURE = 2149,
+  RRC_CONNECTION_OUT_OF_SERVICE_DURING_CELL_REGISTER = 2150,
+  RRC_CONNECTION_ABORT_REQUEST = 2151,
+  RRC_CONNECTION_SYSTEM_INFORMATION_BLOCK_READ_ERROR = 2152,
+  NETWORK_INITIATED_DETACH_WITH_AUTO_REATTACH = 2153,
+  NETWORK_INITIATED_DETACH_NO_AUTO_REATTACH = 2154,
+  ESM_PROCEDURE_TIME_OUT = 2155,
+  INVALID_CONNECTION_ID = 2156,
+  MAXIMIUM_NSAPIS_EXCEEDED = 2157,
+  INVALID_PRIMARY_NSAPI = 2158,
+  CANNOT_ENCODE_OTA_MESSAGE = 2159,
+  RADIO_ACCESS_BEARER_SETUP_FAILURE = 2160,
+  PDP_ESTABLISH_TIMEOUT_EXPIRED = 2161,
+  PDP_MODIFY_TIMEOUT_EXPIRED = 2162,
+  PDP_INACTIVE_TIMEOUT_EXPIRED = 2163,
+  PDP_LOWERLAYER_ERROR = 2164,
+  PDP_MODIFY_COLLISION = 2165,
+  MAXINUM_SIZE_OF_L2_MESSAGE_EXCEEDED = 2166,
+  NAS_REQUEST_REJECTED_BY_NETWORK = 2167,
+  RRC_CONNECTION_INVALID_REQUEST = 2168,
+  RRC_CONNECTION_TRACKING_AREA_ID_CHANGED = 2169,
+  RRC_CONNECTION_RF_UNAVAILABLE = 2170,
+  RRC_CONNECTION_ABORTED_DUE_TO_IRAT_CHANGE = 2171,
+  RRC_CONNECTION_RELEASED_SECURITY_NOT_ACTIVE = 2172,
+  RRC_CONNECTION_ABORTED_AFTER_HANDOVER = 2173,
+  RRC_CONNECTION_ABORTED_AFTER_IRAT_CELL_CHANGE = 2174,
+  RRC_CONNECTION_ABORTED_DURING_IRAT_CELL_CHANGE = 2175,
+  IMSI_UNKNOWN_IN_HOME_SUBSCRIBER_SERVER = 2176,
+  IMEI_NOT_ACCEPTED = 2177,
+  EPS_SERVICES_AND_NON_EPS_SERVICES_NOT_ALLOWED = 2178,
+  EPS_SERVICES_NOT_ALLOWED_IN_PLMN = 2179,
+  MSC_TEMPORARILY_NOT_REACHABLE = 2180,
+  CS_DOMAIN_NOT_AVAILABLE = 2181,
+  ESM_FAILURE = 2182,
+  MAC_FAILURE = 2183,
+  SYNCHRONIZATION_FAILURE = 2184,
+  UE_SECURITY_CAPABILITIES_MISMATCH = 2185,
+  SECURITY_MODE_REJECTED = 2186,
+  UNACCEPTABLE_NON_EPS_AUTHENTICATION = 2187,
+  CS_FALLBACK_CALL_ESTABLISHMENT_NOT_ALLOWED = 2188,
+  NO_EPS_BEARER_CONTEXT_ACTIVATED = 2189,
+  INVALID_EMM_STATE = 2190,
+  NAS_LAYER_FAILURE = 2191,
+  MULTIPLE_PDP_CALL_NOT_ALLOWED = 2192,
+  EMBMS_NOT_ENABLED = 2193,
+  IRAT_HANDOVER_FAILED = 2194,
+  EMBMS_REGULAR_DEACTIVATION = 2195,
+  TEST_LOOPBACK_REGULAR_DEACTIVATION = 2196,
+  LOWER_LAYER_REGISTRATION_FAILURE = 2197,
+  DATA_PLAN_EXPIRED = 2198,
+  UMTS_HANDOVER_TO_IWLAN = 2199,
+  EVDO_CONNECTION_DENY_BY_GENERAL_OR_NETWORK_BUSY = 2200,
+  EVDO_CONNECTION_DENY_BY_BILLING_OR_AUTHENTICATION_FAILURE = 2201,
+  EVDO_HDR_CHANGED = 2202,
+  EVDO_HDR_EXITED = 2203,
+  EVDO_HDR_NO_SESSION = 2204,
+  EVDO_USING_GPS_FIX_INSTEAD_OF_HDR_CALL = 2205,
+  EVDO_HDR_CONNECTION_SETUP_TIMEOUT = 2206,
+  FAILED_TO_ACQUIRE_COLOCATED_HDR = 2207,
+  OTASP_COMMIT_IN_PROGRESS = 2208,
+  NO_HYBRID_HDR_SERVICE = 2209,
+  HDR_NO_LOCK_GRANTED = 2210,
+  DBM_OR_SMS_IN_PROGRESS = 2211,
+  HDR_FADE = 2212,
+  HDR_ACCESS_FAILURE = 2213,
+  UNSUPPORTED_1X_PREV = 2214,
+  LOCAL_END = 2215,
+  NO_SERVICE = 2216,
+  FADE = 2217,
+  NORMAL_RELEASE = 2218,
+  ACCESS_ATTEMPT_ALREADY_IN_PROGRESS = 2219,
+  REDIRECTION_OR_HANDOFF_IN_PROGRESS = 2220,
+  EMERGENCY_MODE = 2221,
+  PHONE_IN_USE = 2222,
+  INVALID_MODE = 2223,
+  INVALID_SIM_STATE = 2224,
+  NO_COLLOCATED_HDR = 2225,
+  UE_IS_ENTERING_POWERSAVE_MODE = 2226,
+  DUAL_SWITCH = 2227,
+  PPP_TIMEOUT = 2228,
+  PPP_AUTH_FAILURE = 2229,
+  PPP_OPTION_MISMATCH = 2230,
+  PPP_PAP_FAILURE = 2231,
+  PPP_CHAP_FAILURE = 2232,
+  PPP_CLOSE_IN_PROGRESS = 2233,
+  LIMITED_TO_IPV4 = 2234,
+  LIMITED_TO_IPV6 = 2235,
+  VSNCP_TIMEOUT = 2236,
+  VSNCP_GEN_ERROR = 2237,
+  VSNCP_APN_UNAUTHORIZED = 2238,
+  VSNCP_PDN_LIMIT_EXCEEDED = 2239,
+  VSNCP_NO_PDN_GATEWAY_ADDRESS = 2240,
+  VSNCP_PDN_GATEWAY_UNREACHABLE = 2241,
+  VSNCP_PDN_GATEWAY_REJECT = 2242,
+  VSNCP_INSUFFICIENT_PARAMETERS = 2243,
+  VSNCP_RESOURCE_UNAVAILABLE = 2244,
+  VSNCP_ADMINISTRATIVELY_PROHIBITED = 2245,
+  VSNCP_PDN_ID_IN_USE = 2246,
+  VSNCP_SUBSCRIBER_LIMITATION = 2247,
+  VSNCP_PDN_EXISTS_FOR_THIS_APN = 2248,
+  VSNCP_RECONNECT_NOT_ALLOWED = 2249,
+  IPV6_PREFIX_UNAVAILABLE = 2250,
+  HANDOFF_PREFERENCE_CHANGED = 2251,
+  SLICE_REJECTED = 2252,
+  MATCH_ALL_RULE_NOT_ALLOWED = 2253,
+  ALL_MATCHING_RULES_FAILED = 2254,
 }
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataProfileInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataProfileInfo.aidl
index 0136fa4..16fada1 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataProfileInfo.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataProfileInfo.aidl
@@ -60,7 +60,7 @@
   const int ID_FOTA = 3;
   const int ID_CBS = 4;
   const int ID_OEM_BASE = 1000;
-  const int ID_INVALID = 0xFFFFFFFF;
+  const int ID_INVALID = -1;
   const int TYPE_COMMON = 0;
   const int TYPE_3GPP = 1;
   const int TYPE_3GPP2 = 2;
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataThrottlingAction.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataThrottlingAction.aidl
index e80a764..4f976cd 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataThrottlingAction.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataThrottlingAction.aidl
@@ -34,8 +34,8 @@
 package android.hardware.radio.data;
 @Backing(type="byte") @JavaDerive(toString=true) @VintfStability
 enum DataThrottlingAction {
-  NO_DATA_THROTTLING,
-  THROTTLE_SECONDARY_CARRIER,
-  THROTTLE_ANCHOR_CARRIER,
-  HOLD,
+  NO_DATA_THROTTLING = 0,
+  THROTTLE_SECONDARY_CARRIER = 1,
+  THROTTLE_ANCHOR_CARRIER = 2,
+  HOLD = 3,
 }
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/LinkAddress.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/LinkAddress.aidl
index 77d637b..48e646e 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/LinkAddress.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/LinkAddress.aidl
@@ -39,5 +39,5 @@
   long deprecationTime;
   long expirationTime;
   const int ADDRESS_PROPERTY_NONE = 0;
-  const int ADDRESS_PROPERTY_DEPRECATED = 0x20;
+  const int ADDRESS_PROPERTY_DEPRECATED = 32;
 }
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/NrQos.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/NrQos.aidl
index be859b7..a0792c3 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/NrQos.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/NrQos.aidl
@@ -37,13 +37,12 @@
   int fiveQi;
   android.hardware.radio.data.QosBandwidth downlink;
   android.hardware.radio.data.QosBandwidth uplink;
-  byte qfi;
   /**
-   * @deprecated use averagingWindowMillis;
+   * @deprecated use qosFlowIdentifier.
    */
+  byte qfi;
   char averagingWindowMs;
-  int averagingWindowMillis = AVERAGING_WINDOW_UNKNOWN;
+  int qosFlowIdentifier;
   const byte FLOW_ID_RANGE_MIN = 1;
   const byte FLOW_ID_RANGE_MAX = 63;
-  const int AVERAGING_WINDOW_UNKNOWN = (-1);
 }
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/PdpProtocolType.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/PdpProtocolType.aidl
index d1c4a62..9771e5c 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/PdpProtocolType.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/PdpProtocolType.aidl
@@ -34,7 +34,7 @@
 package android.hardware.radio.data;
 @Backing(type="int") @JavaDerive(toString=true) @VintfStability
 enum PdpProtocolType {
-  UNKNOWN = (-1),
+  UNKNOWN = -1,
   IP = 0,
   IPV6 = 1,
   IPV4V6 = 2,
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/QosFilter.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/QosFilter.aidl
index de45cc5..e22b359 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/QosFilter.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/QosFilter.aidl
@@ -47,7 +47,7 @@
   const byte DIRECTION_DOWNLINK = 0;
   const byte DIRECTION_UPLINK = 1;
   const byte DIRECTION_BIDIRECTIONAL = 2;
-  const byte PROTOCOL_UNSPECIFIED = (-1);
+  const byte PROTOCOL_UNSPECIFIED = -1;
   const byte PROTOCOL_TCP = 6;
   const byte PROTOCOL_UDP = 17;
   const byte PROTOCOL_ESP = 50;
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/RouteSelectionDescriptor.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/RouteSelectionDescriptor.aidl
index d83df81..434ee7d 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/RouteSelectionDescriptor.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/RouteSelectionDescriptor.aidl
@@ -39,7 +39,7 @@
   byte sscMode;
   android.hardware.radio.data.SliceInfo[] sliceInfo;
   String[] dnn;
-  const byte SSC_MODE_UNKNOWN = (-1);
+  const byte SSC_MODE_UNKNOWN = -1;
   const byte SSC_MODE_1 = 1;
   const byte SSC_MODE_2 = 2;
   const byte SSC_MODE_3 = 3;
diff --git a/radio/aidl/android/hardware/radio/data/NrQos.aidl b/radio/aidl/android/hardware/radio/data/NrQos.aidl
index 4078fdc..28b4a7f 100644
--- a/radio/aidl/android/hardware/radio/data/NrQos.aidl
+++ b/radio/aidl/android/hardware/radio/data/NrQos.aidl
@@ -27,8 +27,6 @@
     const byte FLOW_ID_RANGE_MIN = 1;
     const byte FLOW_ID_RANGE_MAX = 63;
 
-    const int AVERAGING_WINDOW_UNKNOWN = -1;
-
     /**
      * 5G QOS Identifier (5QI), see 3GPP TS 24.501 and 23.501. The allowed values are standard
      * values (1-9, 65-68, 69-70, 75, 79-80, 82-85) defined in the spec and operator specific values
@@ -38,16 +36,13 @@
     QosBandwidth downlink;
     QosBandwidth uplink;
     /**
-     * QOS flow identifier of the QOS flow description in the range
-     * (FLOW_ID_RANGE_MIN, FLOW_ID_RANGE_MAX).
+     * @deprecated use qosFlowIdentifier.
      */
     byte qfi;
-    /**
-     * @deprecated use averagingWindowMillis;
-     */
     char averagingWindowMs;
     /**
-     * The duration over which flow rates are calculated.
-     */
-    int averagingWindowMillis = AVERAGING_WINDOW_UNKNOWN;
+     * QOS flow identifier of the QOS flow description in the range
+     * (FLOW_ID_RANGE_MIN, FLOW_ID_RANGE_MAX).
+     **/
+    int qosFlowIdentifier;
 }
diff --git a/radio/aidl/compat/libradiocompat/data/structs.cpp b/radio/aidl/compat/libradiocompat/data/structs.cpp
index 47f1f86..22cde6b 100644
--- a/radio/aidl/compat/libradiocompat/data/structs.cpp
+++ b/radio/aidl/compat/libradiocompat/data/structs.cpp
@@ -136,8 +136,8 @@
             .fiveQi = qos.fiveQi,
             .downlink = toAidl(qos.downlink),
             .uplink = toAidl(qos.uplink),
-            .qfi = static_cast<int8_t>(qos.qfi),
-            .averagingWindowMillis = qos.averagingWindowMs,
+            .qosFlowIdentifier = static_cast<int8_t>(qos.qfi),
+            .averagingWindowMs = qos.averagingWindowMs,
     };
 }