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

Commit b0b6604c authored by Takeshi Shinohara's avatar Takeshi Shinohara Committed by Toshiya Ikenaga
Browse files

Support self-explanatory icon for GET INKEY and GET INPUT commands 

Self-explanatory icon should be supported for GET INKEY and GET INPUT
like the other proactive commands, e.g. DISPLAY TEXT. The icon
qualifier must be propagated to the STK application.

Bug: 30081488
Change-Id: Iac5b5d21bbd35be73870a7c0908e6cfdf9d5b5e2
parent fb00edac

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

100755 → 100644
+2 −0
Original line number Diff line number Diff line
@@ -454,6 +454,7 @@ class CommandParamsFactory extends Handler { 
        ctlv = searchForTag(ComprehensionTlvTag.ICON_ID, ctlvs);

        if (ctlv != null) {

            iconId = ValueParser.retrieveIconId(ctlv);

            input.iconSelfExplanatory = iconId.selfExplanatory;

        }



        // parse duration
@@ -531,6 +532,7 @@ class CommandParamsFactory extends Handler { 
        ctlv = searchForTag(ComprehensionTlvTag.ICON_ID, ctlvs);

        if (ctlv != null) {

            iconId = ValueParser.retrieveIconId(ctlv);

            input.iconSelfExplanatory = iconId.selfExplanatory;

        }



        input.digitOnly = (cmdDet.commandQualifier & 0x01) == 0;

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

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ public class Input implements Parcelable { 
    public boolean yesNo;

    public boolean helpAvailable;

    public Duration duration;

    public boolean iconSelfExplanatory;



    Input() {

        text = "";
@@ -51,6 +52,7 @@ public class Input implements Parcelable { 
        yesNo = false;

        helpAvailable = false;

        duration = null;

        iconSelfExplanatory = false;

    }



    private Input(Parcel in) {
@@ -66,6 +68,7 @@ public class Input implements Parcelable { 
        yesNo = in.readInt() == 1 ? true : false;

        helpAvailable = in.readInt() == 1 ? true : false;

        duration = in.readParcelable(null);

        iconSelfExplanatory = in.readInt() == 1 ? true : false;

    }



    @Override
@@ -87,6 +90,7 @@ public class Input implements Parcelable { 
        dest.writeInt(yesNo ? 1 : 0);

        dest.writeInt(helpAvailable ? 1 : 0);

        dest.writeParcelable(duration, 0);

        dest.writeInt(iconSelfExplanatory ? 1 : 0);

    }



    public static final Parcelable.Creator<Input> CREATOR = new Parcelable.Creator<Input>() {