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

Commit 1540b923 authored by Nate Jiang's avatar Nate Jiang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Make broadcast protected"" into rvc-d1-dev am: 243cd3ec am:... 

Merge "Revert "Make broadcast protected"" into rvc-d1-dev am: 243cd3ec am: d7428702 am: 5dd79eca

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12241970

Change-Id: I55a841447c02f4887377dff8323c9def03b20075
parents cb493eaa 5dd79eca

core/res/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -355,7 +355,6 @@ 
    <protected-broadcast android:name="com.android.server.wifi.action.CarrierNetwork.USER_ALLOWED_CARRIER" />

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

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

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

    <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" />