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

Commit 5a9786c9 authored by Mohammad Rahimpur's avatar Mohammad Rahimpur Committed by android-build-merger
Browse files

Merge "SAT: SET_UP_MENU missing minimum information" into nyc-mr1-dev 

am: af40ba22

* commit 'af40ba22':
  SAT: SET_UP_MENU missing minimum information

Change-Id: I0b44a19eda12c57f69f2f05e4d135091c1fb13a7
parents dccbddfc af40ba22

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

+10 −0
Original line number Diff line number Diff line
@@ -609,10 +609,20 @@ class CommandParamsFactory extends Handler { 
        ItemsIconId itemsIconId = null;

        Iterator<ComprehensionTlv> iter = ctlvs.iterator();



        AppInterface.CommandType cmdType = AppInterface.CommandType

                .fromInt(cmdDet.typeOfCommand);



        ComprehensionTlv ctlv = searchForTag(ComprehensionTlvTag.ALPHA_ID,

                ctlvs);

        if (ctlv != null) {

            menu.title = ValueParser.retrieveAlphaId(ctlv);

        } else if (cmdType == AppInterface.CommandType.SET_UP_MENU) {

            // According to spec ETSI TS 102 223 section 6.10.3, the

            // Alpha ID is mandatory (and also part of minimum set of

            // elements required) for SET_UP_MENU. If it is not received

            // by ME, then ME should respond with "error: missing minimum

            // information" and not "command performed successfully".

            throw new ResultException(ResultCode.REQUIRED_VALUES_MISSING);

        }



        while (true) {