commit b81390c45f857524fde9de2a6e35178b1bb14bcf
author Amit Mahajan <amitmahajan@google.com> Wed Jun 10 17:04:17 2015 -0700
committer Jeron Susan <jeron.susan@hi-p.com> Fri Sep 09 10:57:13 2016 +0800
tree 57df54c75b0d5af79616c0af4318132319a7cf54
parent ecc2fd1e37b6b0eee7071f7b487467b0ac3b7c8f

FPII-2367: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

And make stk commands protected.

Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b

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

diff --git a/src/java/com/android/internal/telephony/cat/AppInterface.java b/src/java/com/android/internal/telephony/cat/AppInterface.java
index 96a3ff0..7b2bfa0 100644
--- a/src/java/com/android/internal/telephony/cat/AppInterface.java
+++ b/src/java/com/android/internal/telephony/cat/AppInterface.java
@@ -45,6 +45,9 @@
     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

diff --git a/src/java/com/android/internal/telephony/cat/CatService.java b/src/java/com/android/internal/telephony/cat/CatService.java
index a11e1d4..4428961 100644
--- a/src/java/com/android/internal/telephony/cat/CatService.java
+++ b/src/java/com/android/internal/telephony/cat/CatService.java
@@ -433,7 +433,7 @@
         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);
     }
 
     /**
@@ -447,7 +447,7 @@
         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);
     }
 
 
@@ -782,7 +782,7 @@
         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) {
@@ -791,7 +791,7 @@
         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