diff options
| author | Marie Janssen <jamuraa@google.com> | 2017-03-08 10:12:07 -0800 |
|---|---|---|
| committer | Adam Seaton <aseaton@google.com> | 2017-03-21 12:01:18 -0700 |
| commit | 667d2cbe3eb1450f273a4f6595ccef35e1f0fe4b (patch) | |
| tree | ea9d0394fbe7830e444d866a814958ce3a0b0615 | |
| parent | 6422e8fb4429936477f2cac82c472e5e4684f26d (diff) | |
| download | base-667d2cbe3eb1450f273a4f6595ccef35e1f0fe4b.tar.gz | |
Protect Bluetooth OPP ACCEPT and DECLINE broadcast
Fix merge conflict into nyc-mr2-release
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
| -rw-r--r-- | core/res/AndroidManifest.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index ec712bb89f0a..011884cb5495 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -199,6 +199,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" /> |