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

Commit ab96721a authored by Ajay Panicker's avatar Ajay Panicker
Browse files

resolve merge conflicts of 4b39c15d to nyc-mr2-dev-plus-aosp 

Change-Id: I7567db6d1fbb9f8a8b5e29c3e24cdff6508c4b6f
parents 5cd3bb93 4b39c15d

core/res/AndroidManifest.xml

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