diff options
| author | Thomas Joseph Avila <tavila@google.com> | 2017-04-06 22:11:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-06 22:11:35 +0000 |
| commit | aa305c2d192e37146d504f1723372f77097fe0da (patch) | |
| tree | 8ce2b600600d411775e2a360f284317b05c901e3 | |
| parent | eea3ed206e8c05c227d1bb1d57e627064d5275a6 (diff) | |
| parent | 4fc5d98812f732beee8368906089d57ffcef59e4 (diff) | |
| download | base-aa305c2d192e37146d504f1723372f77097fe0da.tar.gz | |
Merge "Protect Bluetooth OPP ACCEPT and DECLINE broadcast" into nyc-mr2-security-a-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 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" /> |