From 0fc949217669862be13796114d5e54980d3c0fd1 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Thu, 4 May 2017 11:50:51 -0700 Subject: [PATCH] Moved channels settings from carrier config to resources Since CBS channels are more countries specific instead of carrier specific, moving it to resources makes more sense. Test: Manual bug: 31223529 Merged-In: I251a55ba0b17a96ee545cad68558c1ee2c6a707c Change-Id: I251a55ba0b17a96ee545cad68558c1ee2c6a707c --- telephony/java/android/telephony/CarrierConfigManager.java | 7 ------- .../com/android/internal/telephony/gsm/SmsCbConstants.java | 12 ------------ 2 files changed, 19 deletions(-) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index ecfdbaa73556..de55f953fe43 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -880,13 +880,6 @@ public class CarrierConfigManager { "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 * on UI for the LAUNCH_BROWSER STK command. diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsCbConstants.java b/telephony/java/com/android/internal/telephony/gsm/SmsCbConstants.java index bce5680b2863..f28d1263d13a 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 -- 2.11.0