diff options
author | Thomas Joseph Avila <tavila@google.com> | 2017-03-22 19:15:17 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-22 19:15:22 +0000 |
commit | e7102382a60069ff1253053da34c232a5c5a4ff8 (patch) | |
tree | 8ce2b600600d411775e2a360f284317b05c901e3 | |
parent | f806d65e615b942c268a5f68d44bde9d55634972 (diff) | |
parent | 667d2cbe3eb1450f273a4f6595ccef35e1f0fe4b (diff) | |
download | base-e7102382a60069ff1253053da34c232a5c5a4ff8.tar.gz |
Merge "Protect Bluetooth OPP ACCEPT and DECLINE broadcast" into nyc-mr2-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" /> |