Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c

Change-Id: I2b9aeca138aefb0579b3be8014b3f0bf49d99764
This commit is contained in:
Marie Janssen
2017-03-14 10:09:52 -07:00

View File

@@ -194,6 +194,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" />