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

am: 00bce50dc3

Change-Id: I4235d63f1c9aeb3be8b276c082d707e20f8c1d9a
This commit is contained in:
Marie Janssen
2017-06-12 22:57:58 +00:00
committed by android-build-merger

View File

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