summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nate Jiang <qiangjiang@google.com> 2020-07-28 20:33:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-28 20:33:08 +0000
commitd742870221e339f273b29049cf1a5862d8c18ef1 (patch)
treec066e5ff6cf3403fcdd63b28af7f8ae0330d432e
parent24b4700df1c1f47f6a9db04a9299afeffb30b07c (diff)
parent243cd3ec1ac3b2093d316c493b8e7e0dc47c12b4 (diff)
Merge "Revert "Make broadcast protected"" into rvc-d1-dev am: 243cd3ec1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12241970 Change-Id: I74760f6ebe563c9350a407f766bff77e74c5b445
-rw-r--r--core/res/AndroidManifest.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index bcb4b92d5e7b..013249335268 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -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" />