summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2015-07-14 00:40:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-14 00:40:05 +0000
commitc1b687d0926a461bedb1eb50ac288c33681ed547 (patch)
tree2ec34ebf75d59d8cae14a6e64f3c798e8e538fd5
parent4011b73dbfc341b1c2d1b308447c7d39ecd3dda3 (diff)
parent6b0473a168247d5f41f76f5aaabd2019049e0ed4 (diff)
downloadandroid_packages_apps_CellBroadcastReceiver-c1b687d0926a461bedb1eb50ac288c33681ed547.tar.gz
android_packages_apps_CellBroadcastReceiver-c1b687d0926a461bedb1eb50ac288c33681ed547.tar.bz2
android_packages_apps_CellBroadcastReceiver-c1b687d0926a461bedb1eb50ac288c33681ed547.zip
am 6b0473a1: am d064a40a: am 141aca85: Send broadcast twice - once for READ_PHONE_STATE & once for PRIVILEGED
* commit '6b0473a168247d5f41f76f5aaabd2019049e0ed4': Send broadcast twice - once for READ_PHONE_STATE & once for PRIVILEGED
-rw-r--r--src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java4
-rw-r--r--src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
index 7f880833..3500d6fc 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
@@ -281,6 +281,10 @@ public class CellBroadcastAlertService extends Service {
CellBroadcastReceiverApp.setLatestAreaInfo(message);
Intent intent = new Intent(CB_AREA_INFO_RECEIVED_ACTION);
intent.putExtra("message", message);
+ // Send broadcast twice, once for apps that have PRIVILEGED permission and once
+ // for those that have the runtime one
+ sendBroadcastAsUser(intent, UserHandle.ALL,
+ android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE);
sendBroadcastAsUser(intent, UserHandle.ALL,
android.Manifest.permission.READ_PHONE_STATE);
return false; // area info broadcasts are displayed in Settings status screen
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
index 37fbc16c..8c747637 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
@@ -99,6 +99,10 @@ public class CellBroadcastReceiver extends BroadcastReceiver {
Intent areaInfoIntent = new Intent(
CellBroadcastAlertService.CB_AREA_INFO_RECEIVED_ACTION);
areaInfoIntent.putExtra("message", message);
+ // Send broadcast twice, once for apps that have PRIVILEGED permission and once
+ // for those that have the runtime one
+ context.sendBroadcastAsUser(areaInfoIntent, UserHandle.ALL,
+ android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE);
context.sendBroadcastAsUser(areaInfoIntent, UserHandle.ALL,
android.Manifest.permission.READ_PHONE_STATE);
}