Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e06743f authored by Marie Janssen's avatar Marie Janssen Committed by android-build-merger
Browse files

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

Merge "Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce1 am: 00bce50d am: 297dbb86" into oc-dr1-dev-plus-aosp
am: 1270b399

Change-Id: I77469544f4cd29f2393e4310ff83ed1da4d5ecfe
parents a915a88c 1270b399

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -455,6 +455,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" />