Skip to content

Commit 5a36e06

Browse files
Robert GreenwaltAndroid (Google) Code Review
authored andcommitted
Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev
2 parents b4d5a9e + 47918ae commit 5a36e06

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

core/res/AndroidManifest.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,30 @@
143143

144144
<protected-broadcast android:name="android.intent.action.DREAMING_STARTED" />
145145
<protected-broadcast android:name="android.intent.action.DREAMING_STOPPED" />
146+
<protected-broadcast android:name="android.intent.action.ANY_DATA_STATE" />
147+
148+
<protected-broadcast android:name="com.android.server.WifiManager.action.START_SCAN" />
149+
<protected-broadcast android:name="com.android.server.WifiManager.action.DELAYED_DRIVER_STOP" />
150+
<protected-broadcast android:name="android.net.wifi.WIFI_STATE_CHANGED" />
151+
<protected-broadcast android:name="android.net.wifi.WIFI_AP_STATE_CHANGED" />
152+
<protected-broadcast android:name="android.net.wifi.SCAN_RESULTS" />
153+
<protected-broadcast android:name="android.net.wifi.RSSI_CHANGED" />
154+
<protected-broadcast android:name="android.net.wifi.STATE_CHANGE" />
155+
<protected-broadcast android:name="android.net.wifi.LINK_CONFIGURATION_CHANGED" />
156+
<protected-broadcast android:name="android.net.wifi.CONFIGURED_NETWORKS_CHANGE" />
157+
<protected-broadcast android:name="android.net.wifi.supplicant.CONNECTION_CHANGE" />
158+
<protected-broadcast android:name="android.net.wifi.supplicant.STATE_CHANGE" />
159+
<protected-broadcast android:name="android.net.wifi.p2p.STATE_CHANGED" />
160+
<protected-broadcast android:name="android.net.wifi.p2p.DISCOVERY_STATE_CHANGE" />
161+
<protected-broadcast android:name="android.net.wifi.p2p.THIS_DEVICE_CHANGED" />
162+
<protected-broadcast android:name="android.net.wifi.p2p.PEERS_CHANGED" />
163+
<protected-broadcast android:name="android.net.wifi.p2p.CONNECTION_STATE_CHANGE" />
164+
<protected-broadcast android:name="android.net.wifi.p2p.PERSISTENT_GROUPS_CHANGED" />
165+
<protected-broadcast android:name="android.net.conn.TETHER_STATE_CHANGED" />
166+
<protected-broadcast android:name="android.net.conn.INET_CONDITION_ACTION" />
167+
168+
169+
146170

147171
<!-- ====================================== -->
148172
<!-- Permissions for things that cost money -->

0 commit comments

Comments
 (0)