diff options
| author | Marie Janssen <jamuraa@google.com> | 2017-03-08 10:12:07 -0800 |
|---|---|---|
| committer | Adam Seaton <aseaton@google.com> | 2017-03-23 17:13:34 +0000 |
| commit | e17be374299d3e011336d3d8177e735ff5a046d5 (patch) | |
| tree | f20916b4de1d4cfa0e3cb935c7a85de8edfe3140 | |
| parent | b4062880f6dad0facf41a87a24cb0e0f17558e20 (diff) | |
| download | base-e17be374299d3e011336d3d8177e735ff5a046d5.tar.gz | |
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
| -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 430c6b6459a3..c79d50067f93 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" /> |