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:48:24 -0700 |
| commit | 46fb3c25177dc65c16b82ef7e0835906cfbd32ac (patch) | |
| tree | 153cc9bef6471e86a1fd31361468b5c18ab70810 | |
| parent | 01a79c43398ccdd11773a52cd40ab325ffd3744b (diff) | |
| download | android_frameworks_opt_telephony-stable/cm-12.0-YNG4N.tar.gz android_frameworks_opt_telephony-stable/cm-12.0-YNG4N.tar.bz2 android_frameworks_opt_telephony-stable/cm-12.0-YNG4N.zip | |
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.stable/cm-12.0-YNG4N
And make stk commands protected.
CYNGNOS-446
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
(cherry picked from commit 1d1ff6ab7a89478f098128601d4f50e9860303bc)
| -rw-r--r-- | src/java/com/android/internal/telephony/cat/AppInterface.java | 3 | ||||
| -rw-r--r-- | 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 96a3ff0cc..7b2bfa052 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 = "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 diff --git a/src/java/com/android/internal/telephony/cat/CatService.java b/src/java/com/android/internal/telephony/cat/CatService.java index 5a6123cea..91177ff04 100644 --- a/src/java/com/android/internal/telephony/cat/CatService.java +++ b/src/java/com/android/internal/telephony/cat/CatService.java @@ -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 |