Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6643ea82 authored by Nick Kralevich's avatar Nick Kralevich
Browse files

resolved conflicts for merge of 011132a7 to jb-mr1-dev 

Change-Id: I304ef91eef99526dec348a59b12c0934173bcfcb
parents 580aa579 011132a7

core/res/AndroidManifest.xml

+25 −0
Original line number Diff line number Diff line
@@ -144,6 +144,31 @@ 
    <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" />









    <!-- ====================================== -->

    <!-- Permissions for things that cost money -->

    <!-- ====================================== -->