summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Marie Janssen <jamuraa@google.com> 2017-06-12 22:57:58 +0000
committer android-build-merger <android-build-merger@google.com> 2017-06-12 22:57:58 +0000
commit297dbb86fed9075b3124583d8b9f9684a1357392 (patch)
tree452842561f9d2cbfc91895e39466c13efe694996
parentf96c9a0fa22a5b5230b91749bcf2490e892a864e (diff)
parent00bce50dc36fb1d2ea6f028f498728385e1e1e28 (diff)
Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162
am: 00bce50dc3 Change-Id: I4235d63f1c9aeb3be8b276c082d707e20f8c1d9a
-rw-r--r--core/res/AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 7fccb9f5ccfb..277b6be5eda9 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -454,6 +454,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="NotificationManagerService.TIMEOUT" />
<protected-broadcast android:name="ScheduleConditionProvider.EVALUATE" />