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

Commit cc53d8d8 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Removed deprecate_cdma flag" into main

parents 9418e9a9 e109296f

core/api/current.txt

+42 −42
Original line number Diff line number Diff line
@@ -45506,11 +45506,11 @@ package android.telephony { 
    field public static final String KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY = "carrier_vvm_package_name_string_array";

    field public static final String KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL = "carrier_wfc_ims_available_bool";

    field public static final String KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL = "carrier_wfc_supports_wifi_only_bool";

    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final String KEY_CDMA_3WAYCALL_FLASH_DELAY_INT = "cdma_3waycall_flash_delay_int";

    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";

    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final String KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";

    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final String KEY_CDMA_ROAMING_MODE_INT = "cdma_roaming_mode_int";

    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";

    field @Deprecated public static final String KEY_CDMA_3WAYCALL_FLASH_DELAY_INT = "cdma_3waycall_flash_delay_int";

    field @Deprecated public static final String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";

    field @Deprecated public static final String KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";

    field @Deprecated public static final String KEY_CDMA_ROAMING_MODE_INT = "cdma_roaming_mode_int";

    field @Deprecated public static final String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";

    field public static final String KEY_CELLULAR_SERVICE_CAPABILITIES_INT_ARRAY = "cellular_service_capabilities_int_array";

    field public static final String KEY_CELLULAR_USAGE_SETTING_INT = "cellular_usage_setting_int";

    field public static final String KEY_CHECK_PRICING_WITH_CARRIER_FOR_DATA_ROAMING_BOOL = "check_pricing_with_carrier_data_roaming_bool";
@@ -45537,7 +45537,7 @@ package android.telephony { 
    field public static final String KEY_DEFAULT_VM_NUMBER_ROAMING_AND_IMS_UNREGISTERED_STRING = "default_vm_number_roaming_and_ims_unregistered_string";

    field public static final String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string";

    field public static final String KEY_DIAL_STRING_REPLACE_STRING_ARRAY = "dial_string_replace_string_array";

    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool";

    field @Deprecated public static final String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool";

    field public static final String KEY_DISABLE_CHARGE_INDICATION_BOOL = "disable_charge_indication_bool";

    field @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static final String KEY_DISABLE_DUN_APN_WHILE_ROAMING_WITH_PRESET_APN_BOOL = "disable_dun_apn_while_roaming_with_preset_apn_bool";

    field public static final String KEY_DISABLE_SUPPLEMENTARY_SERVICES_IN_AIRPLANE_MODE_BOOL = "disable_supplementary_services_in_airplane_mode_bool";
@@ -45690,11 +45690,11 @@ package android.telephony { 
    field @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static final String KEY_SATELLITE_SUPPORTED_MSG_APPS_STRING_ARRAY = "satellite_supported_msg_apps_string_array";

    field public static final String KEY_SHOW_4G_FOR_3G_DATA_ICON_BOOL = "show_4g_for_3g_data_icon_bool";

    field public static final String KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL = "show_4g_for_lte_data_icon_bool";

    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final String KEY_SHOW_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool";

    field @Deprecated public static final String KEY_SHOW_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool";

    field @FlaggedApi("android.net.platform.flags.avoid_bad_wifi_from_carrier_config") public static final String KEY_SHOW_AVOID_BAD_WIFI_TOGGLE_BOOL = "show_avoid_bad_wifi_bool";

    field public static final String KEY_SHOW_BLOCKING_PAY_PHONE_OPTION_BOOL = "show_blocking_pay_phone_option_bool";

    field public static final String KEY_SHOW_CALL_BLOCKING_DISABLED_NOTIFICATION_ALWAYS_BOOL = "show_call_blocking_disabled_notification_always_bool";

    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final String KEY_SHOW_CDMA_CHOICES_BOOL = "show_cdma_choices_bool";

    field @Deprecated public static final String KEY_SHOW_CDMA_CHOICES_BOOL = "show_cdma_choices_bool";

    field public static final String KEY_SHOW_FORWARDED_NUMBER_BOOL = "show_forwarded_number_bool";

    field public static final String KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL = "show_iccid_in_sim_status_bool";

    field public static final String KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL = "show_ims_registration_status_bool";
@@ -45725,7 +45725,7 @@ package android.telephony { 
    field public static final String KEY_SUPPORT_ENHANCED_CALL_BLOCKING_BOOL = "support_enhanced_call_blocking_bool";

    field public static final String KEY_SUPPORT_IMS_CONFERENCE_EVENT_PACKAGE_BOOL = "support_ims_conference_event_package_bool";

    field public static final String KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL = "support_pause_ims_video_calls_bool";

    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool";

    field @Deprecated public static final String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool";

    field public static final String KEY_SUPPORT_TDSCDMA_BOOL = "support_tdscdma_bool";

    field public static final String KEY_SUPPORT_TDSCDMA_ROAMING_NETWORKS_STRING_ARRAY = "support_tdscdma_roaming_networks_string_array";

    field public static final String KEY_SWITCH_DATA_TO_PRIMARY_IF_PRIMARY_IS_OOS_BOOL = "switch_data_to_primary_if_primary_is_oos_bool";
@@ -45735,7 +45735,7 @@ package android.telephony { 
    field public static final String KEY_USE_ACS_FOR_RCS_BOOL = "use_acs_for_rcs_bool";

    field public static final String KEY_USE_HFA_FOR_PROVISIONING_BOOL = "use_hfa_for_provisioning_bool";

    field public static final String KEY_USE_IP_FOR_CALLING_INDICATOR_BOOL = "use_ip_for_calling_indicator_bool";

    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final String KEY_USE_OTASP_FOR_PROVISIONING_BOOL = "use_otasp_for_provisioning_bool";

    field @Deprecated public static final String KEY_USE_OTASP_FOR_PROVISIONING_BOOL = "use_otasp_for_provisioning_bool";

    field @Deprecated public static final String KEY_USE_RCS_PRESENCE_BOOL = "use_rcs_presence_bool";

    field public static final String KEY_USE_RCS_SIP_OPTIONS_BOOL = "use_rcs_sip_options_bool";

    field public static final String KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL = "use_wfc_home_network_mode_in_roaming_network_bool";
@@ -46171,13 +46171,13 @@ package android.telephony { 
    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellIdentity> CREATOR;

  }













  @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public final class CellIdentityCdma extends android.telephony.CellIdentity {













    method @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public int getBasestationId();













    method @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public int getLatitude();













    method @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public int getLongitude();













    method @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public int getNetworkId();













    method @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public int getSystemId();













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellIdentityCdma> CREATOR;













  @Deprecated public final class CellIdentityCdma extends android.telephony.CellIdentity {













    method @Deprecated public int getBasestationId();













    method @Deprecated public int getLatitude();













    method @Deprecated public int getLongitude();













    method @Deprecated public int getNetworkId();













    method @Deprecated public int getSystemId();













    field @Deprecated @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellIdentityCdma> CREATOR;















  }





























  public final class CellIdentityGsm extends android.telephony.CellIdentity {










@@ -46269,11 +46269,11 @@ package android.telephony {













    field public static final long UNAVAILABLE_LONG = 9223372036854775807L; // 0x7fffffffffffffffL















  }



























  @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public final class CellInfoCdma extends android.telephony.CellInfo implements android.os.Parcelable {













    method @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") @NonNull public android.telephony.CellIdentityCdma getCellIdentity();













    method @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") @NonNull public android.telephony.CellSignalStrengthCdma getCellSignalStrength();













    method @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public void writeToParcel(android.os.Parcel, int);













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellInfoCdma> CREATOR;













  @Deprecated public final class CellInfoCdma extends android.telephony.CellInfo implements android.os.Parcelable {













    method @Deprecated @NonNull public android.telephony.CellIdentityCdma getCellIdentity();













    method @Deprecated @NonNull public android.telephony.CellSignalStrengthCdma getCellSignalStrength();













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













    field @Deprecated @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellInfoCdma> CREATOR;















  }





























  public final class CellInfoGsm extends android.telephony.CellInfo implements android.os.Parcelable {










@@ -47853,11 +47853,11 @@ package android.telephony {













    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getImei(int);















    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_SMS, android.Manifest.permission.READ_PHONE_NUMBERS}) public String getLine1Number();















    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public String getManualNetworkSelectionPlmn();













    method @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") @Nullable public String getManufacturerCode();













    method @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") @Nullable public String getManufacturerCode(int);













    method @Deprecated @Nullable public String getManufacturerCode();













    method @Deprecated @Nullable public String getManufacturerCode(int);















    method public static long getMaximumCallComposerPictureSize();













    method @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getMeid();













    method @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getMeid(int);













    method @Deprecated @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getMeid();













    method @Deprecated @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getMeid(int);















    method public String getMmsUAProfUrl();















    method public String getMmsUserAgent();















    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getNai();










@@ -48003,10 +48003,10 @@ package android.telephony {













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















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















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













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int CDMA_ROAMING_MODE_AFFILIATED = 1; // 0x1













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int CDMA_ROAMING_MODE_ANY = 2; // 0x2













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int CDMA_ROAMING_MODE_HOME = 0; // 0x0













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int CDMA_ROAMING_MODE_RADIO_DEFAULT = -1; // 0xffffffff













    field @Deprecated public static final int CDMA_ROAMING_MODE_AFFILIATED = 1; // 0x1













    field @Deprecated public static final int CDMA_ROAMING_MODE_ANY = 2; // 0x2













    field @Deprecated public static final int CDMA_ROAMING_MODE_HOME = 0; // 0x0













    field @Deprecated public static final int CDMA_ROAMING_MODE_RADIO_DEFAULT = -1; // 0xffffffff















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















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















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









@@ -48026,9 +48026,9 @@ package android.telephony {













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















    field public static final int DATA_UNKNOWN = -1; // 0xffffffff















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













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int ERI_FLASH = 2; // 0x2













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int ERI_OFF = 1; // 0x1













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int ERI_ON = 0; // 0x0













    field @Deprecated public static final int ERI_FLASH = 2; // 0x2













    field @Deprecated public static final int ERI_OFF = 1; // 0x1













    field @Deprecated public static final int ERI_ON = 0; // 0x0















    field public static final String EVENT_DISPLAY_EMERGENCY_MESSAGE = "android.telephony.event.DISPLAY_EMERGENCY_MESSAGE";















    field public static final String EXTRA_ACTIVE_SIM_SUPPORTED_COUNT = "android.telephony.extra.ACTIVE_SIM_SUPPORTED_COUNT";















    field public static final String EXTRA_APN_PROTOCOL = "android.telephony.extra.APN_PROTOCOL";










@@ -48069,11 +48069,11 @@ package android.telephony {













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















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















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













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int NETWORK_TYPE_1xRTT = 7; // 0x7













    field @Deprecated public static final int NETWORK_TYPE_1xRTT = 7; // 0x7















    field public static final long NETWORK_TYPE_BITMASK_1xRTT = 64L; // 0x40L













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final long NETWORK_TYPE_BITMASK_CDMA = 8L; // 0x8L













    field @Deprecated public static final long NETWORK_TYPE_BITMASK_CDMA = 8L; // 0x8L















    field public static final long NETWORK_TYPE_BITMASK_EDGE = 2L; // 0x2L













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final long NETWORK_TYPE_BITMASK_EHRPD = 8192L; // 0x2000L













    field @Deprecated public static final long NETWORK_TYPE_BITMASK_EHRPD = 8192L; // 0x2000L















    field public static final long NETWORK_TYPE_BITMASK_EVDO_0 = 16L; // 0x10L















    field public static final long NETWORK_TYPE_BITMASK_EVDO_A = 32L; // 0x20L















    field public static final long NETWORK_TYPE_BITMASK_EVDO_B = 2048L; // 0x800L









@@ -48090,12 +48090,12 @@ package android.telephony {













    field public static final long NETWORK_TYPE_BITMASK_TD_SCDMA = 65536L; // 0x10000L















    field public static final long NETWORK_TYPE_BITMASK_UMTS = 4L; // 0x4L















    field public static final long NETWORK_TYPE_BITMASK_UNKNOWN = 0L; // 0x0L













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int NETWORK_TYPE_CDMA = 4; // 0x4













    field @Deprecated public static final int NETWORK_TYPE_CDMA = 4; // 0x4















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













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int NETWORK_TYPE_EHRPD = 14; // 0xe













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int NETWORK_TYPE_EVDO_0 = 5; // 0x5













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int NETWORK_TYPE_EVDO_A = 6; // 0x6













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int NETWORK_TYPE_EVDO_B = 12; // 0xc













    field @Deprecated public static final int NETWORK_TYPE_EHRPD = 14; // 0xe













    field @Deprecated public static final int NETWORK_TYPE_EVDO_0 = 5; // 0x5













    field @Deprecated public static final int NETWORK_TYPE_EVDO_A = 6; // 0x6













    field @Deprecated public static final int NETWORK_TYPE_EVDO_B = 12; // 0xc















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















    field public static final int NETWORK_TYPE_GSM = 16; // 0x10















    field public static final int NETWORK_TYPE_HSDPA = 8; // 0x8









@@ -48109,7 +48109,7 @@ package android.telephony {













    field public static final int NETWORK_TYPE_TD_SCDMA = 17; // 0x11















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















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













    field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int PHONE_TYPE_CDMA = 2; // 0x2













    field @Deprecated public static final int PHONE_TYPE_CDMA = 2; // 0x2















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















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















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

























core/api/system-current.txt



+47
−47


























File changed.
Preview size limit exceeded, changes collapsed.
























telecomm/framework/java/android/telecom/ParcelableCallAnalytics.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -16,7 +16,6 @@





























package android.telecom;





























import android.annotation.FlaggedApi;















import android.annotation.SystemApi;















import android.os.Parcel;















import android.os.Parcelable;










@@ -258,7 +257,6 @@ public class ParcelableCallAnalytics implements Parcelable {













    /**















     * @deprecated Legacy CDMA is unsupported.















     */













    @FlaggedApi(com.android.internal.telephony.flags.Flags.FLAG_DEPRECATE_CDMA)















    @Deprecated















    public static final int CDMA_PHONE = 0x1;















    public static final int GSM_PHONE = 0x2;

































telephony/java/android/telephony/CarrierConfigManager.java



+0
−11




























Original line number
Diff line number
Diff line








@@ -547,7 +547,6 @@ public class CarrierConfigManager {













     * @deprecated Legacy CDMA is unsupported.















     */















    @Deprecated













    @FlaggedApi(Flags.FLAG_DEPRECATE_CDMA)















    public static final String KEY_SHOW_CDMA_CHOICES_BOOL = "show_cdma_choices_bool";





























    /** CDMA activation goes through HFA */









@@ -559,7 +558,6 @@ public class CarrierConfigManager {













     */















    // TODO: This should be combined with config_use_hfa_for_provisioning and implemented as an enum















    // (NONE, HFA, OTASP).













    @FlaggedApi(Flags.FLAG_DEPRECATE_CDMA)















    @Deprecated















    public static final String KEY_USE_OTASP_FOR_PROVISIONING_BOOL =















            "use_otasp_for_provisioning_bool";









@@ -575,7 +573,6 @@ public class CarrierConfigManager {













     * @deprecated Legacy CDMA is unsupported.















     */















    @Deprecated













    @FlaggedApi(Flags.FLAG_DEPRECATE_CDMA)















    public static final String KEY_SHOW_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool";





























    /**









@@ -583,7 +580,6 @@ public class CarrierConfigManager {













     * @deprecated Legacy CDMA is unsupported.















     */















    @Deprecated













    @FlaggedApi(Flags.FLAG_DEPRECATE_CDMA)















    public static final String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool";





























    /**










@@ -624,7 +620,6 @@ public class CarrierConfigManager {













     * @deprecated Legacy CDMA is unsupported.















     */















    @Deprecated













    @FlaggedApi(Flags.FLAG_DEPRECATE_CDMA)















    public static final String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL =















            "disable_cdma_activation_code_bool";
























@@ -704,7 +699,6 @@ public class CarrierConfigManager {













     * Value is string array of SIDs to be considered roaming for 3GPP2 RATs.















     * @deprecated Legacy CDMA is unsupported.















     */













    @FlaggedApi(Flags.FLAG_DEPRECATE_CDMA)















    @Deprecated















    public static final String















            KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";









@@ -714,7 +708,6 @@ public class CarrierConfigManager {













     * Value is string array of SIDs to be considered not roaming for 3GPP2 RATs.















     * @deprecated Legacy CDMA is unsupported.















     */













    @FlaggedApi(Flags.FLAG_DEPRECATE_CDMA)















    @Deprecated















    public static final String















            KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";










@@ -1423,7 +1416,6 @@ public class CarrierConfigManager {













     * sends out successive DTMF tones on the network.















     * @deprecated Legacy CDMA is unsupported.















     */













    @FlaggedApi(Flags.FLAG_DEPRECATE_CDMA)















    @Deprecated















    public static final String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";
























@@ -2547,7 +2539,6 @@ public class CarrierConfigManager {













     * flash is sent.















     * @deprecated Legacy CDMA is unsupported.















     */













    @FlaggedApi(Flags.FLAG_DEPRECATE_CDMA)















    @Deprecated















    public static final String KEY_CDMA_3WAYCALL_FLASH_DELAY_INT = "cdma_3waycall_flash_delay_int";























@@ -2565,7 +2556,6 @@ public class CarrierConfigManager {













     *















     * @deprecated Legacy CDMA is unsupported.















     */













    @FlaggedApi(Flags.FLAG_DEPRECATE_CDMA)















    @Deprecated















    public static final String KEY_CDMA_ROAMING_MODE_INT = "cdma_roaming_mode_int";























@@ -2575,7 +2565,6 @@ public class CarrierConfigManager {













     * @deprecated Legacy CDMA is unsupported.















     * @hide















     */













    @FlaggedApi(Flags.FLAG_DEPRECATE_CDMA)















    @Deprecated















    @SystemApi















    public static final String KEY_SUPPORT_CDMA_1X_VOICE_CALLS_BOOL =

































telephony/java/android/telephony/CellBroadcastService.java



+0
−4




























Original line number
Diff line number
Diff line








@@ -17,7 +17,6 @@













package android.telephony;































import android.annotation.CallSuper;













import android.annotation.FlaggedApi;















import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.SystemApi;









@@ -29,7 +28,6 @@ import android.os.IBinder;













import android.os.RemoteCallback;















import android.telephony.cdma.CdmaSmsCbProgramData;





























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















import com.android.internal.util.FastPrintWriter;































import java.io.FileDescriptor;










@@ -92,7 +90,6 @@ public abstract class CellBroadcastService extends Service {













     * @param serviceCategory the CDMA SCPT service category















     * @deprecated Legacy CDMA is unsupported.















     */













    @FlaggedApi(Flags.FLAG_DEPRECATE_CDMA)















    @Deprecated















    public void onCdmaCellBroadcastSms(int slotIndex, @NonNull byte[] bearerData,















            @CdmaSmsCbProgramData.Category int serviceCategory) {}









@@ -109,7 +106,6 @@ public abstract class CellBroadcastService extends Service {













     *                           dial string as and an ArrayList of {@link CdmaSmsCbProgramResults}.















     * @deprecated Legacy CDMA is unsupported.















     */













    @FlaggedApi(Flags.FLAG_DEPRECATE_CDMA)















    @Deprecated















    public void onCdmaScpMessage(int slotIndex,















            @NonNull List<CdmaSmsCbProgramData> smsCbProgramData,