am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev

* commit '6643ea823bf8b0726da0518ffecfcc7a9f60f87d':
  Secure a handful of framework broadcasts

diff --cc core/res/AndroidManifest.xml
index 316de50,89c8c36..2a357af
--- 1/core/res/AndroidManifest.xml
--- 2/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@@ -143,10 -143,11 +143,35 @@@
  
      <protected-broadcast android:name="android.intent.action.DREAMING_STARTED" />
      <protected-broadcast android:name="android.intent.action.DREAMING_STOPPED" />
 +    <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" />
++
++
++
+ 
+     <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" />