diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index b9c0e1c6cc758..a0cf3bb3cf7ea 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -902,13 +902,6 @@ public class CarrierConfigManager { public static final String KEY_BROADCAST_EMERGENCY_CALL_STATE_CHANGES_BOOL = "broadcast_emergency_call_state_changes_bool"; - /** - * Cell broadcast additional channels enbled by the carrier - * @hide - */ - public static final String KEY_CARRIER_ADDITIONAL_CBS_CHANNELS_STRINGS = - "carrier_additional_cbs_channels_strings"; - /** * Indicates whether STK LAUNCH_BROWSER command is disabled. * If {@code true}, then the browser will not be launched diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsCbConstants.java b/telephony/java/com/android/internal/telephony/gsm/SmsCbConstants.java index bce5680b2863d..f28d1263d13a3 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SmsCbConstants.java +++ b/telephony/java/com/android/internal/telephony/gsm/SmsCbConstants.java @@ -34,18 +34,6 @@ public class SmsCbConstants { public static final int MESSAGE_ID_GSMA_ALLOCATED_CHANNEL_50 = 0x0032; - /** Channel 911 required by Taiwan NCC. ID 0~999 is allocated by GSMA */ - public static final int MESSAGE_ID_GSMA_ALLOCATED_CHANNEL_911 - = 0x038F; // 911 - - /** Channel 919 required by Taiwan NCC and Israel. ID 0~999 is allocated by GSMA */ - public static final int MESSAGE_ID_GSMA_ALLOCATED_CHANNEL_919 - = 0x0397; // 919 - - /** Channel 928 required by Israel. ID 0~999 is allocated by GSMA */ - public static final int MESSAGE_ID_GSMA_ALLOCATED_CHANNEL_928 - = 0x03A0; // 928 - /** Start of PWS Message Identifier range (includes ETWS and CMAS). */ public static final int MESSAGE_ID_PWS_FIRST_IDENTIFIER = 0x1100; // 4352