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

Commit bfee4bc6 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Added additional cbs channels support" into nyc-mr1-dev am: 597be616 

am: 0eda86c2

* commit '0eda86c2':
  Added additional cbs channels support

Change-Id: I93ccd4dce74840fdcac47207ca2f30c9fd88b92a
parents 92a1bd01 0eda86c2

telephony/java/android/telephony/CarrierConfigManager.java

+7 −0
Original line number Diff line number Diff line
@@ -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";