Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Moved channels settings from carrier config to resources" am: 79eddf8c0a

Browse Source 
am: 54ccaa0e99

Change-Id: I44d1e2602867049c9e82911a5b4066e6f0c88d7f
This commit is contained in:
Jack Yu
2017-08-09 07:29:23 +00:00
committed by android-build-merger
parent 4eba68c81f 54ccaa0e99
commit 562c2febe0
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -902,13 +902,6 @@ public class CarrierConfigManager {
public static final String KEY_BROADCAST_EMERGENCY_CALL_STATE_CHANGES_BOOL = public static final String KEY_BROADCAST_EMERGENCY_CALL_STATE_CHANGES_BOOL =
"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. * Indicates whether STK LAUNCH_BROWSER command is disabled.
* If {@code true}, then the browser will not be launched * If {@code true}, then the browser will not be launched

12
telephony/java/com/android/internal/telephony/gsm/SmsCbConstants.java
View File

@@ -34,18 +34,6 @@ public class SmsCbConstants {
public static final int MESSAGE_ID_GSMA_ALLOCATED_CHANNEL_50 public static final int MESSAGE_ID_GSMA_ALLOCATED_CHANNEL_50
= 0x0032; = 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). */ /** Start of PWS Message Identifier range (includes ETWS and CMAS). */
public static final int MESSAGE_ID_PWS_FIRST_IDENTIFIER public static final int MESSAGE_ID_PWS_FIRST_IDENTIFIER
= 0x1100; // 4352 = 0x1100; // 4352