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

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

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

am: 54ccaa0e

Change-Id: I44d1e2602867049c9e82911a5b4066e6f0c88d7f
parents 4eba68c8 54ccaa0e

telephony/java/android/telephony/CarrierConfigManager.java

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

telephony/java/com/android/internal/telephony/gsm/SmsCbConstants.java

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