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

Commit e91b2247 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Added CMAS monthly test additional language messages support." into mnc-dr-dev

parents 5591557d 7bb470a0

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

+42 −33
Original line number Diff line number Diff line
@@ -96,9 +96,18 @@ public class SmsCbConstants { 
    /** CMAS Message Identifier for operator defined use. */

    public static final int MESSAGE_ID_CMAS_ALERT_OPERATOR_DEFINED_USE              = 0x111E;



    /** CMAS Message Identifier for Presidential Level alerts for Additional Languages. */

    /** CMAS Message Identifier for Presidential Level alerts for additional languages. */

    public static final int MESSAGE_ID_CMAS_ALERT_PRESIDENTIAL_LEVEL_LANGUAGE       = 0x111F;



    /** CMAS Message Identifier for the Required Monthly Test for additional languages. */

    public static final int MESSAGE_ID_CMAS_ALERT_REQUIRED_MONTHLY_TEST_LANGUAGE    = 0x1129;



    /** CMAS Message Identifier for CMAS Exercise for additional languages. */

    public static final int MESSAGE_ID_CMAS_ALERT_EXERCISE_LANGUAGE                 = 0x112A;



    /** CMAS Message Identifier for operator defined use for additional languages. */

    public static final int MESSAGE_ID_CMAS_ALERT_OPERATOR_DEFINED_USE_LANGUAGE     = 0x112B;



    /** End of CMAS Message Identifier range (including future extensions). */

    public static final int MESSAGE_ID_CMAS_LAST_IDENTIFIER                         = 0x112F;

src/java/com/android/internal/telephony/gsm/SmsCbHeader.java

+4 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ class SmsCbHeader { 
    private int getCmasMessageClass() {

        switch (mMessageIdentifier) {

            case SmsCbConstants.MESSAGE_ID_CMAS_ALERT_PRESIDENTIAL_LEVEL:

            case SmsCbConstants.MESSAGE_ID_CMAS_ALERT_PRESIDENTIAL_LEVEL_LANGUAGE:

                return SmsCbCmasInfo.CMAS_CLASS_PRESIDENTIAL_LEVEL_ALERT;



            case SmsCbConstants.MESSAGE_ID_CMAS_ALERT_EXTREME_IMMEDIATE_OBSERVED:
@@ -313,12 +314,15 @@ class SmsCbHeader { 
                return SmsCbCmasInfo.CMAS_CLASS_CHILD_ABDUCTION_EMERGENCY;



            case SmsCbConstants.MESSAGE_ID_CMAS_ALERT_REQUIRED_MONTHLY_TEST:

            case SmsCbConstants.MESSAGE_ID_CMAS_ALERT_REQUIRED_MONTHLY_TEST_LANGUAGE:

                return SmsCbCmasInfo.CMAS_CLASS_REQUIRED_MONTHLY_TEST;



            case SmsCbConstants.MESSAGE_ID_CMAS_ALERT_EXERCISE:

            case SmsCbConstants.MESSAGE_ID_CMAS_ALERT_EXERCISE_LANGUAGE:

                return SmsCbCmasInfo.CMAS_CLASS_CMAS_EXERCISE;



            case SmsCbConstants.MESSAGE_ID_CMAS_ALERT_OPERATOR_DEFINED_USE:

            case SmsCbConstants.MESSAGE_ID_CMAS_ALERT_OPERATOR_DEFINED_USE_LANGUAGE:

                return SmsCbCmasInfo.CMAS_CLASS_OPERATOR_DEFINED_USE;



            default: