diff options
| author | 2012-12-06 08:35:36 -0800 | |
|---|---|---|
| committer | 2012-12-06 08:35:36 -0800 | |
| commit | d1654e17d46f2165f74ea0096e82667e074aa8a2 (patch) | |
| tree | f560f8d948997f28dc388b441351f3f069b57e57 | |
| parent | 2b0b6596e4300350a84bbe917fd87f3b79bd2888 (diff) | |
| parent | a170bb81d5953c1f0aa0f5f49bd72eb43c50e233 (diff) | |
Merge "Remove duplicate AndroidManifest.xml entries."
| -rw-r--r-- | core/res/AndroidManifest.xml | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 2a357afc28ef..316de5067b75 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -168,31 +168,6 @@ - <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 --> <!-- ====================================== --> |