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

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

Merge commit 'faf40708' into... 

Merge commit 'faf40708' into manual_merge_faf40708836c am: 4034a9a9
am: 89d2b46a

Change-Id: I5f710900167558283cb9e898c2022d8991dbb5c3
parents 11c5ff03 89d2b46a

core/res/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ 
    <protected-broadcast android:name="android.btopp.intent.action.OPEN" />

    <protected-broadcast android:name="android.btopp.intent.action.OPEN_INBOUND" />

    <protected-broadcast android:name="android.btopp.intent.action.TRANSFER_COMPLETE" />

    <protected-broadcast android:name="android.btopp.intent.action.ACCEPT" />

    <protected-broadcast android:name="android.btopp.intent.action.DECLINE" />

    <protected-broadcast android:name="com.android.bluetooth.gatt.REFRESH_BATCHED_SCAN" />

    <protected-broadcast android:name="com.android.bluetooth.pbap.authchall" />

    <protected-broadcast android:name="com.android.bluetooth.pbap.userconfirmtimeout" />