diff options
| author | 2017-03-14 19:29:50 +0000 | |
|---|---|---|
| committer | 2017-03-14 19:29:50 +0000 | |
| commit | 4b39c15da0f5d100b9ce6fc29a8f499362c53542 (patch) | |
| tree | 877f81bac0c2ff46c03d4802c2269c14878af59c | |
| parent | d49386eaa517f35ee640da2c288941d2a78d41a1 (diff) | |
| parent | c1a593902601c85e5c95f0eee39980fcfcad7447 (diff) | |
Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c am: 4034a9a96a am: 89d2b46a4a
am: c1a5939026
Change-Id: I50df57c208542d35bc72851fa37e47731bbd9965
| -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..b0630c421ca9 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -198,6 +198,8 @@ <protected-broadcast android:name="android.btopp.intent.action.OPEN" /> <protected-broadcast android:name="android.btopp.intent.action.OPEN_INBOUND" /> <protected-broadcast android:name="android.btopp.intent.action.TRANSFER_COMPLETE" /> + <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.gatt.REFRESH_BATCHED_SCAN" /> <protected-broadcast android:name="com.android.bluetooth.pbap.authchall" /> <protected-broadcast android:name="com.android.bluetooth.pbap.userconfirmtimeout" /> |