diff options
| author | Kuan-Tung Pan <kuantung@google.com> | 2017-03-23 23:05:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-23 23:05:23 +0000 |
| commit | 17fa8560dd7132e7d945d049ddda41d0efb5eb9e (patch) | |
| tree | 76f94ebcb58271054a0b37ba464f859ffd01f547 | |
| parent | 730cf1b83cc4f16c54ee3cb90f981dd5db7ef46d (diff) | |
| parent | c0748ad5b5aec6c8d39980f28db0938746cb4b41 (diff) | |
| download | base-17fa8560dd7132e7d945d049ddda41d0efb5eb9e.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-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 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" /> |