commit 00bce50dc36fb1d2ea6f028f498728385e1e1e28
author Marie Janssen <jamuraa@google.com> Mon Jun 12 22:47:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jun 12 22:47:00 2017 +0000
tree c9c4a2899e762988f55ef40cc933173305e5f3f3
parent af04c43e3bfc0454919915a72d54cf28277607fc
parent 5cfbbce162360321bfbd36e1cf491bf32d448f53

Merge "Protect broadcast used in settings for bond cancel"
am: 5cfbbce162

Change-Id: Ieb433bca4189ba3d309b417ed6822e836c9468ed

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index c2f27a9..914099f 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -445,6 +445,7 @@
     <protected-broadcast android:name="com.android.server.NetworkTimeUpdateService.action.POLL" />
     <protected-broadcast android:name="com.android.server.telecom.intent.action.CALLS_ADD_ENTRY" />
     <protected-broadcast android:name="com.android.settings.location.MODE_CHANGING" />
+    <protected-broadcast android:name="com.android.settings.bluetooth.ACTION_DISMISS_PAIRING" />
 
     <protected-broadcast android:name="ScheduleConditionProvider.EVALUATE" />
     <protected-broadcast android:name="EventConditionProvider.EVALUATE" />