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

Commit 27e8390d authored by Amit Mahajan's avatar Amit Mahajan Committed by Android Git Automerger
Browse files

am 796b9a92: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 

* commit '796b9a92':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
parents 935e8f3b 796b9a92

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

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

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



    // Permission required by STK command receiver

    public static final String STK_PERMISSION = "android.permission.RECEIVE_STK_COMMANDS";



    /*

     * 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 −4
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ public class CatService extends Handler implements AppInterface { 
        intent.putExtra("STK CMD", cmdMsg);

        intent.putExtra("SLOT_ID", mSlotId);

        CatLog.d(this, "Sending CmdMsg: " + cmdMsg+ " on slotid:" + mSlotId);

        mContext.sendBroadcast(intent);

        mContext.sendBroadcast(intent, AppInterface.STK_PERMISSION);

    }



    /**
@@ -522,7 +522,7 @@ public class CatService extends Handler implements AppInterface { 
        mCurrntCmd = mMenuCmd;

        Intent intent = new Intent(AppInterface.CAT_SESSION_END_ACTION);

        intent.putExtra("SLOT_ID", mSlotId);

        mContext.sendBroadcast(intent);

        mContext.sendBroadcast(intent, AppInterface.STK_PERMISSION);

    }
@@ -876,7 +876,7 @@ public class CatService extends Handler implements AppInterface { 
        intent.putExtra(AppInterface.CARD_STATUS, cardPresent);

        CatLog.d(this, "Sending Card Status: "

                + cardState + " " + "cardPresent: " + cardPresent);

        mContext.sendBroadcast(intent);

        mContext.sendBroadcast(intent, AppInterface.STK_PERMISSION);

    }



    private void broadcastAlphaMessage(String alphaString) {
@@ -885,7 +885,7 @@ public class CatService extends Handler implements AppInterface { 
        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

        intent.putExtra(AppInterface.ALPHA_STRING, alphaString);

        intent.putExtra("SLOT_ID", mSlotId);

        mContext.sendBroadcast(intent);

        mContext.sendBroadcast(intent, AppInterface.STK_PERMISSION);

    }



    @Override