From: Marie Janssen <jamuraa@google.com>
Date: Wed, 8 Mar 2017 18:12:07 +0000 (-0800)
Subject: Protect Bluetooth OPP ACCEPT and DECLINE broadcast
X-Git-Tag: android-x86-9.0-r1~1044^2~7^2~1^2^2~4^2~6^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=52c8ba1ecff872ea425d58b37afc1d55528b95f8;p=android-x86%2Fframeworks-base.git

Protect Bluetooth OPP ACCEPT and DECLINE broadcast

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
---

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 84a9ed366314..74a353027648 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -193,6 +193,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.pbap.authchall" />
     <protected-broadcast android:name="com.android.bluetooth.pbap.userconfirmtimeout" />
     <protected-broadcast android:name="com.android.bluetooth.pbap.authresponse" />