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

Commit 46fb3c25 authored by Amit Mahajan's avatar Amit Mahajan Committed by Abhisek Devkota
Browse files

DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 

And make stk commands protected.

CYNGNOS-446
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
(cherry picked from commit 1d1ff6ab)
parent 01a79c43

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";



    /*

     * This is broadcast from the ActivityManagerService when the screen

     * switches to idle or busy state

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

+4 −4
Original line number Diff line number Diff line
@@ -458,7 +458,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);

    }



    /**
@@ -472,7 +472,7 @@ public class CatService extends Handler implements AppInterface { 
        Intent intent = new Intent(AppInterface.CAT_SESSION_END_ACTION);

        intent.putExtra("SLOT_ID", mSlotId);

        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

        mContext.sendBroadcast(intent);

        mContext.sendBroadcast(intent, AppInterface.STK_PERMISSION);

    }
@@ -877,7 +877,7 @@ public class CatService extends Handler implements AppInterface { 
        intent.putExtra("SLOT_ID", mSlotId);

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

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

        mContext.sendBroadcast(intent);

        mContext.sendBroadcast(intent, AppInterface.STK_PERMISSION);

    }



    private void broadcastAlphaMessage(String alphaString) {
@@ -886,7 +886,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