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

Merge "Added additional cbs channels support" into nyc-mr1-dev

Browse Source 
am: 597be61652

* commit '597be61652982bbafb91bdde7f8a913d3385e030':
  Added additional cbs channels support

Change-Id: Ibacf62058f18cc471bbe3c365b980df11f6e991b
This commit is contained in:
Jack Yu
2016-05-05 21:10:03 +00:00
committed by android-build-merger
parent 8b9c453e35 597be61652
commit 0eda86c207
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -600,6 +600,13 @@ 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";
// These variables are used by the MMS service and exposed through another API, {@link
// SmsManager}. The variable names and string values are copied from there.
public static final String KEY_MMS_ALIAS_ENABLED_BOOL = "aliasEnabled";