Google Git
Sign in
android/platform/frameworks/base/b351be2^!/.
commit
b351be2a5a641de92823fd1a5607f9d4baffab6d
[log]
author
Marie Janssen <jamuraa@google.com>
Wed Mar 08 10:12:07 2017 -0800
committer
android-build-team Robot <android-build-team-robot@google.com>
Wed Aug 23 19:19:54 2017 +0000
tree
e438bf440836a962182937f9cd7c661bb99edc22
parent
ba94d7a518834af3cb580bd2fa66dc0efc9e8271 [diff]
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
(cherry picked from commit 52c8ba1ecff872ea425d58b37afc1d55528b95f8)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index e9a3409..bd83bd7 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" />