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

am e74050a9: Merge change 25175 into eclair

Browse Source 
Merge commit 'e74050a9ca248eb6a8d3d8fc2d7712b340afddcc' into eclair-plus-aosp

* commit 'e74050a9ca248eb6a8d3d8fc2d7712b340afddcc':
  Allow only System Service to send most Bluetooth intents.
This commit is contained in:
Nick Pelly
2009-09-15 18:15:24 -07:00
committed by Android Git Automerger
parent b0e2f832b0 e74050a9ca
commit e10bbc50a6
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/res/AndroidManifest.xml
View File

@@ -52,6 +52,23 @@
<protected-broadcast android:name="android.intent.action.NEW_OUTGOING_CALL" /> <protected-broadcast android:name="android.intent.action.NEW_OUTGOING_CALL" />
<protected-broadcast android:name="android.intent.action.REBOOT" /> <protected-broadcast android:name="android.intent.action.REBOOT" />
<protected-broadcast android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
<protected-broadcast android:name="android.bluetooth.adapter.action.SCAN_MODE_CHANGED" />
<protected-broadcast android:name="android.bluetooth.adapter.action.DISCOVERY_STARTED" />
<protected-broadcast android:name="android.bluetooth.adapter.action.DISCOVERY_FINISHED" />
<protected-broadcast android:name="android.bluetooth.adapter.action.LOCAL_NAME_CHANGED" />
<protected-broadcast android:name="android.bluetooth.device.action.FOUND" />
<protected-broadcast android:name="android.bluetooth.device.action.DISAPPEARED" />
<protected-broadcast android:name="android.bluetooth.device.action.CLASS_CHANGED" />
<protected-broadcast android:name="android.bluetooth.device.action.ACL_CONNECTED" />
<protected-broadcast android:name="android.bluetooth.device.action.ACL_DISCONNECT_REQUESTED" />
<protected-broadcast android:name="android.bluetooth.device.action.ACL_DISCONNECTED" />
<protected-broadcast android:name="android.bluetooth.device.action.NAME_CHANGED" />
<protected-broadcast android:name="android.bluetooth.device.action.BOND_STATE_CHANGED" />
<protected-broadcast android:name="android.bluetooth.device.action.NAME_FAILED" />
<protected-broadcast android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
<protected-broadcast android:name="android.bluetooth.device.action.PAIRING_CANCEL" />
<!-- ====================================== --> <!-- ====================================== -->
<!-- Permissions for things that cost money --> <!-- Permissions for things that cost money -->
<!-- ====================================== --> <!-- ====================================== -->