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

Commit 4b39c15d 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
am: c1a59390

Change-Id: I50df57c208542d35bc72851fa37e47731bbd9965
parents d49386ea c1a59390

core/res/AndroidManifest.xml

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