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

Commit 572efe14 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge changes I9a0bf442,Id4c7c086 into qt-qpr1-dev am: 20fd6564 

Change-Id: I01d7602089fcbecb4f4a0a9f718abf9a600b0687
parents ea4d0ca0 20fd6564

core/res/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -347,6 +347,9 @@ 
    <protected-broadcast android:name="com.android.server.net.action.SNOOZE_WARNING" />

    <protected-broadcast android:name="com.android.server.net.action.SNOOZE_RAPID" />

    <protected-broadcast android:name="com.android.server.wifi.ACTION_SHOW_SET_RANDOMIZATION_DETAILS" />

    <protected-broadcast android:name="com.android.server.wifi.action.NetworkSuggestion.USER_ALLOWED_APP" />

    <protected-broadcast android:name="com.android.server.wifi.action.NetworkSuggestion.USER_DISALLOWED_APP" />

    <protected-broadcast android:name="com.android.server.wifi.action.NetworkSuggestion.USER_DISMISSED" />

    <protected-broadcast android:name="com.android.server.wifi.ConnectToNetworkNotification.USER_DISMISSED_NOTIFICATION" />

    <protected-broadcast android:name="com.android.server.wifi.ConnectToNetworkNotification.CONNECT_TO_NETWORK" />

    <protected-broadcast android:name="com.android.server.wifi.ConnectToNetworkNotification.PICK_WIFI_NETWORK" />