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

Commit cc0146c9 authored by Preeti Ahuja's avatar Preeti Ahuja Committed by Amit Mahajan
Browse files

STK: Remove dependency on idle screen notification 

1. Remove support for Idle Screen available set up
event list and event download.
2. Remove dependency of Set Up Idle Mode Text from
idle screen notification.
3. Remove dependency of Display Text command from
idle screen notification.

Bug: 17553408
Change-Id: I9d15ae89cb0412032355a813f6c47b0e394504d3
parent ff62e12c

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

+0 −14
Original line number Diff line number Diff line
@@ -45,20 +45,6 @@ public interface AppInterface { 
    public static final String CAT_ICC_STATUS_CHANGE =

                                    "android.intent.action.stk.icc_status_change";



    /*

     * This is broadcast from the ActivityManagerService when the screen

     * switches to idle or busy state

     */

    public static final String CAT_IDLE_SCREEN_ACTION =

                                    "android.intent.action.stk.idle_screen";



    /*

     * This is broadcast from the Stk Apps to ActivityManagerService when the screen

     * status is requested.

     */

    public static final String CHECK_SCREEN_IDLE_ACTION =

                                    "android.intent.action.stk.check_screen_idle";



    /*

     * Callback function from app to telephony to pass a result code and user's

     * input back to the ICC.

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

+4 −25
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ import java.io.ByteArrayOutputStream; 
import java.util.List;

import java.util.Locale;



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;
@@ -341,10 +339,7 @@ public class CatService extends Handler implements AppInterface { 
            CatLog.d(this,"Event: " + eventVal);

            switch (eventVal) {

                /* Currently android is supporting only the below events in SetupEventList

                 * Browser Termination,

                 * Idle Screen Available and

                 * Language Selection.  */

                case IDLE_SCREEN_AVAILABLE_EVENT:

                case LANGUAGE_SELECTION_EVENT:

                    break;

                default:
@@ -716,16 +711,11 @@ public class CatService extends Handler implements AppInterface { 


        /*

         * Currently the below events are supported:

         * Browser Termination,

         * Idle Screen Available and

         * Language Selection Event.

         * Other event download commands should be encoded similar way

         */

        /* TODO: eventDownload should be extended for other Envelope Commands */

        switch (event) {

            case IDLE_SCREEN_AVAILABLE_EVENT:

                CatLog.d(sInstance, " Sending Idle Screen Available event download to ICC");

                break;

            case LANGUAGE_SELECTION_EVENT:

                CatLog.d(sInstance, " Sending Language Selection event download to ICC");

                tag = 0x80 | ComprehensionTlvTag.LANGUAGE.value();
@@ -983,14 +973,8 @@ public class CatService extends Handler implements AppInterface { 
                }

                break;

            case DISPLAY_TEXT:

                if (resMsg.mResCode == ResultCode.TERMINAL_CRNTLY_UNABLE_TO_PROCESS) {

                    // For screenbusy case there will be addtional information in the terminal

                    // response. And the value of the additional information byte is 0x01.

                    resMsg.setAdditionalInfo(0x01);

                } else {

                resMsg.mIncludeAdditionalInfo = false;

                resMsg.mAdditionalInfo = 0;

                }

                break;

            case LAUNCH_BROWSER:

                break;
@@ -1004,13 +988,8 @@ public class CatService extends Handler implements AppInterface { 
                mCurrntCmd = null;

                return;

            case SET_UP_EVENT_LIST:

                if (IDLE_SCREEN_AVAILABLE_EVENT == resMsg.mEventValue) {

                    eventDownload(resMsg.mEventValue, DEV_ID_DISPLAY, DEV_ID_UICC,

                            resMsg.mAddedInfo, false);

                } else {

                eventDownload(resMsg.mEventValue, DEV_ID_TERMINAL, DEV_ID_UICC,

                        resMsg.mAddedInfo, false);

                }

                // No need to send the terminal response after event download.

                return;

            default: