diff options
| author | 2012-11-30 10:40:18 -0800 | |
|---|---|---|
| committer | 2012-11-30 10:40:18 -0800 | |
| commit | 4816f4b4088ce35b2cddf1034ae483e30b7ed22c (patch) | |
| tree | 2f249b73ff93c10679885680b0e71636d69bdbd2 | |
| parent | 590e0e5b8dbc1f9d9bef69d675b158d6a36ac073 (diff) | |
| parent | 0def7b94960ae551c498212d97c7919da7529429 (diff) | |
am 0def7b94: am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev
* commit '0def7b94960ae551c498212d97c7919da7529429':
Secure a handful of framework broadcasts
| -rw-r--r-- | core/res/AndroidManifest.xml | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 316de5067b75..2a357afc28ef 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -168,6 +168,31 @@ + <protected-broadcast android:name="android.intent.action.ANY_DATA_STATE" /> + + <protected-broadcast android:name="com.android.server.WifiManager.action.START_SCAN" /> + <protected-broadcast android:name="com.android.server.WifiManager.action.DELAYED_DRIVER_STOP" /> + <protected-broadcast android:name="android.net.wifi.WIFI_STATE_CHANGED" /> + <protected-broadcast android:name="android.net.wifi.WIFI_AP_STATE_CHANGED" /> + <protected-broadcast android:name="android.net.wifi.SCAN_RESULTS" /> + <protected-broadcast android:name="android.net.wifi.RSSI_CHANGED" /> + <protected-broadcast android:name="android.net.wifi.STATE_CHANGE" /> + <protected-broadcast android:name="android.net.wifi.LINK_CONFIGURATION_CHANGED" /> + <protected-broadcast android:name="android.net.wifi.CONFIGURED_NETWORKS_CHANGE" /> + <protected-broadcast android:name="android.net.wifi.supplicant.CONNECTION_CHANGE" /> + <protected-broadcast android:name="android.net.wifi.supplicant.STATE_CHANGE" /> + <protected-broadcast android:name="android.net.wifi.p2p.STATE_CHANGED" /> + <protected-broadcast android:name="android.net.wifi.p2p.DISCOVERY_STATE_CHANGE" /> + <protected-broadcast android:name="android.net.wifi.p2p.THIS_DEVICE_CHANGED" /> + <protected-broadcast android:name="android.net.wifi.p2p.PEERS_CHANGED" /> + <protected-broadcast android:name="android.net.wifi.p2p.CONNECTION_STATE_CHANGE" /> + <protected-broadcast android:name="android.net.wifi.p2p.PERSISTENT_GROUPS_CHANGED" /> + <protected-broadcast android:name="android.net.conn.TETHER_STATE_CHANGED" /> + <protected-broadcast android:name="android.net.conn.INET_CONDITION_ACTION" /> + + + + <!-- ====================================== --> <!-- Permissions for things that cost money --> <!-- ====================================== --> |