From 2ae2c56c166f1a8569f6e49a850534788188b6b5 Mon Sep 17 00:00:00 2001
From: Amit Mahajan <amitmahajan@google.com>
Date: Wed, 10 Jun 2015 17:04:17 -0700
Subject: 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 | 3 +++
 src/java/com/android/internal/telephony/cat/CatService.java   | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/java/com/android')

diff --git a/src/java/com/android/internal/telephony/cat/AppInterface.java b/src/java/com/android/internal/telephony/cat/AppInterface.java
index 944e39d09..07e810912 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 interface AppInterface {
     public static final String CAT_ICC_STATUS_CHANGE =
                                     "org.codeaurora.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
diff --git a/src/java/com/android/internal/telephony/cat/CatService.java b/src/java/com/android/internal/telephony/cat/CatService.java
index b1c67083b..97dcf90cd 100755
--- a/src/java/com/android/internal/telephony/cat/CatService.java
+++ b/src/java/com/android/internal/telephony/cat/CatService.java
@@ -464,7 +464,7 @@ public class CatService extends Handler implements AppInterface {
         Intent intent = new Intent(AppInterface.CAT_CMD_ACTION);
         intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         intent.putExtra("STK CMD", cmdMsg);
-        mContext.sendBroadcast(intent);
+        mContext.sendBroadcast(intent, AppInterface.STK_PERMISSION);
     }
 
     /**
@@ -477,7 +477,7 @@ public class CatService extends Handler implements AppInterface {
         mCurrntCmd = mMenuCmd;
         Intent intent = new Intent(AppInterface.CAT_SESSION_END_ACTION);
         intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-        mContext.sendBroadcast(intent);
+        mContext.sendBroadcast(intent, AppInterface.STK_PERMISSION);
     }
 
     private void sendTerminalResponse(CommandDetails cmdDet,
@@ -929,7 +929,7 @@ public class CatService extends Handler implements AppInterface {
         Intent intent = new Intent(AppInterface.CAT_ALPHA_NOTIFY_ACTION);
         intent.putExtra(AppInterface.ALPHA_STRING, alphaString);
         intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-        mContext.sendBroadcast(intent);
+        mContext.sendBroadcast(intent, AppInterface.STK_PERMISSION);
     }
     /**
      ** This function sends a CARD status (ABSENT, PRESENT, REFRESH) to STK_APP.
@@ -955,7 +955,7 @@ public class CatService extends Handler implements AppInterface {
         CatLog.d(this, "Sending Card Status: "
                 + cardState + " " + "cardPresent: " + cardPresent);
 
-        mContext.sendBroadcast(intent);
+        mContext.sendBroadcast(intent, AppInterface.STK_PERMISSION);
     }
 
     @Override
-- 
cgit v1.2.3