Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c am: 4034a9a96a am: 89d2b46a4a

Browse Source 
am: c1a5939026

Change-Id: I50df57c208542d35bc72851fa37e47731bbd9965
This commit is contained in:
Marie Janssen
2017-03-14 19:29:50 +00:00
committed by android-build-merger
parent d49386eaa5 c1a5939026
commit 4b39c15da0
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/AndroidManifest.xml
View File

@@ -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" />