commit c0748ad5b5aec6c8d39980f28db0938746cb4b41
author Marie Janssen <jamuraa@google.com> Wed Mar 08 10:12:07 2017 -0800
committer Adam Seaton <aseaton@google.com> Thu Mar 16 16:20:48 2017 -0700
tree a6844d8f61d6bc3b5d29189869f019c42c5a1dc4
parent af8fde449ee44b093dc004e05ac6bb4672919f21

Protect Bluetooth OPP ACCEPT and DECLINE broadcast
fix merge conflict into nyc-mr1-release branches
Non-system apps could send these, and accept OPP transfers without user
interaction.

Test: run POC code, see that it crashes instaed of accepting
Bug: 35258579
Change-Id: I37bf2e17b4d612258f9dbaa879727ac7c72e5969

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 430c6b6..c79d500 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -198,6 +198,8 @@
     <protected-broadcast android:name="android.btopp.intent.action.OPEN_INBOUND" />
     <protected-broadcast android:name="android.btopp.intent.action.TRANSFER_COMPLETE" />
     <protected-broadcast android:name="com.android.bluetooth.gatt.REFRESH_BATCHED_SCAN" />
+    <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.pbap.authchall" />
     <protected-broadcast android:name="com.android.bluetooth.pbap.userconfirmtimeout" />
     <protected-broadcast android:name="com.android.bluetooth.pbap.authresponse" />