diff options
author | Amit Mahajan <amitmahajan@google.com> | 2015-06-10 17:04:17 -0700 |
---|---|---|
committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2015-08-18 14:46:58 -0700 |
commit | d30575d6fc1c7ff55e5037eb7ad6b1d5be017827 (patch) | |
tree | 0841468899cff3b1755430d75b253a012e2bea54 | |
parent | c28cc87cb70f2e666aaa82834b82c0043284bb07 (diff) | |
download | android_frameworks_opt_telephony-stable/cm-11.0-XNG3C.tar.gz android_frameworks_opt_telephony-stable/cm-11.0-XNG3C.tar.bz2 android_frameworks_opt_telephony-stable/cm-11.0-XNG3C.zip |
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.stable/cm-11.0-XNG3C
And make stk commands protected.
CYNGNOS-446
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
(cherry picked from commit 2ae2c56c166f1a8569f6e49a850534788188b6b5)
-rw-r--r-- | src/java/com/android/internal/telephony/cat/AppInterface.java | 3 | ||||
-rwxr-xr-x | src/java/com/android/internal/telephony/cat/CatService.java | 8 |
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 |