diff options
| author | Thomas Joseph Avila <tavila@google.com> | 2017-03-23 17:45:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-23 17:45:40 +0000 |
| commit | 8ca113017f6c5bcf90e6e4a2fb16838905d5ffdf (patch) | |
| tree | 4ee12c15273a7c6c98989319214bc7dca6ee2a08 | |
| parent | aeefec3f9d739140886a09036380574128aa5659 (diff) | |
| parent | e17be374299d3e011336d3d8177e735ff5a046d5 (diff) | |
| download | base-8ca113017f6c5bcf90e6e4a2fb16838905d5ffdf.tar.gz | |
Merge "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." into nyc-mr1-security-e-release
| -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" /> |