aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/com/android/internal
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2015-06-10 17:04:17 -0700
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2015-08-18 14:31:18 -0700
commit2ae2c56c166f1a8569f6e49a850534788188b6b5 (patch)
tree0841468899cff3b1755430d75b253a012e2bea54 /src/java/com/android/internal
parentc28cc87cb70f2e666aaa82834b82c0043284bb07 (diff)
downloadandroid_frameworks_opt_telephony-2ae2c56c166f1a8569f6e49a850534788188b6b5.tar.gz
android_frameworks_opt_telephony-2ae2c56c166f1a8569f6e49a850534788188b6b5.tar.bz2
android_frameworks_opt_telephony-2ae2c56c166f1a8569f6e49a850534788188b6b5.zip
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
And make stk commands protected. Bug: 21697171 Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
Diffstat (limited to 'src/java/com/android/internal')
-rw-r--r--src/java/com/android/internal/telephony/cat/AppInterface.java3
-rwxr-xr-xsrc/java/com/android/internal/telephony/cat/CatService.java8
2 files changed, 7 insertions, 4 deletions
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