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

Commit db868671 authored by Jordan Liu's avatar Jordan Liu Committed by Gerrit Code Review
Browse files

Merge "Do not inform user when the alpha identifier is a null data"

parents b65da2fb b8c6a9b0

src/java/com/android/internal/telephony/cat/CommandParamsFactory.java

+14 −10
Original line number Diff line number Diff line
@@ -28,16 +28,16 @@ import java.util.Iterator; 
import java.util.List;

import java.util.Locale;



import static com.android.internal.telephony.cat.CatCmdMessage.

                   SetupEventListConstants.USER_ACTIVITY_EVENT;

import static com.android.internal.telephony.cat.CatCmdMessage.

                   SetupEventListConstants.IDLE_SCREEN_AVAILABLE_EVENT;

import static com.android.internal.telephony.cat.CatCmdMessage.

                   SetupEventListConstants.LANGUAGE_SELECTION_EVENT;

import static com.android.internal.telephony.cat.CatCmdMessage.

                   SetupEventListConstants.BROWSER_TERMINATION_EVENT;

import static com.android.internal.telephony.cat.CatCmdMessage.

                   SetupEventListConstants.BROWSING_STATUS_EVENT;

import static com.android.internal.telephony.cat.CatCmdMessage

                   .SetupEventListConstants.BROWSER_TERMINATION_EVENT;

import static com.android.internal.telephony.cat.CatCmdMessage

                   .SetupEventListConstants.BROWSING_STATUS_EVENT;

import static com.android.internal.telephony.cat.CatCmdMessage

                   .SetupEventListConstants.IDLE_SCREEN_AVAILABLE_EVENT;

import static com.android.internal.telephony.cat.CatCmdMessage

                   .SetupEventListConstants.LANGUAGE_SELECTION_EVENT;

import static com.android.internal.telephony.cat.CatCmdMessage

                   .SetupEventListConstants.USER_ACTIVITY_EVENT;

/**

 * Factory class, used for decoding raw byte arrays, received from baseband,

 * into a CommandParams object.
@@ -917,6 +917,10 @@ class CommandParamsFactory extends Handler { 
        ctlv = searchForTag(ComprehensionTlvTag.ALPHA_ID, ctlvs);

        if (ctlv != null) {

            textMsg.text = ValueParser.retrieveAlphaId(ctlv);

            // Assign the tone message text to empty string, if alpha identifier

            // data is null. If no alpha identifier tlv is present, then tone

            // message text will be null.

            if (textMsg.text == null) textMsg.text = "";

        }

        // parse tone duration

        ctlv = searchForTag(ComprehensionTlvTag.DURATION, ctlvs);