commit 6213e3cd8ecb5e97047864755bb93d229a343be9
author Julia Reynolds <juliacr@google.com> Tue Jul 27 16:47:26 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 27 16:47:26 2021 +0000
tree 781bf22f7204e282aa8b4b73fbc3a6a5a2672f8b
parent c20f6b17c87a1e273d654f5228f92c09499ac43e
parent 44d4056877327d08ffa91a599ad86555cdedab2d

Merge "Add NMS broadcasts to protected list" into sc-dev am: 92145ddf77 am: 44d4056877

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

Change-Id: Idb905a28c2152600bbf91ec3724508a2f4dd78a1

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 679d87a..f74ee9b 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -618,7 +618,11 @@
 
     <protected-broadcast android:name="com.android.server.fingerprint.ACTION_LOCKOUT_RESET" />
     <protected-broadcast android:name="android.net.wifi.PASSPOINT_ICON_RECEIVED" />
+
     <protected-broadcast android:name="com.android.server.notification.CountdownConditionProvider" />
+    <protected-broadcast android:name="android.server.notification.action.ENABLE_NAS" />
+    <protected-broadcast android:name="android.server.notification.action.DISABLE_NAS" />
+    <protected-broadcast android:name="android.server.notification.action.LEARNMORE_NAS" />
 
     <protected-broadcast android:name="com.android.internal.location.ALARM_WAKEUP" />
     <protected-broadcast android:name="com.android.internal.location.ALARM_TIMEOUT" />