diff options
| author | 2012-04-26 14:30:31 -0700 | |
|---|---|---|
| committer | 2012-04-26 14:30:31 -0700 | |
| commit | 9ad1b113260dfb1ac04a7c30e804e24e74dada4f (patch) | |
| tree | 482774be0f3624cb1719aa02de4698218d8585d1 | |
| parent | aeeee6a3642360c1659f3bf14b46b93e3250104a (diff) | |
| parent | 8f014059d3084fcce9e82b4b1f8b8323744ac52d (diff) | |
Merge "Make audio routing Intents protected" into jb-dev
| -rw-r--r-- | core/res/AndroidManifest.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 60d2159cff0f..3ae2b4ec8283 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -112,6 +112,13 @@ <protected-broadcast android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" /> <protected-broadcast android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" /> + <protected-broadcast android:name="android.intent.action.HEADSET_PLUG" /> + <protected-broadcast android:name="android.intent.action.ANALOG_AUDIO_DOCK_PLUG" /> + <protected-broadcast android:name="android.intent.action.DIGITAL_AUDIO_DOCK_PLUG" /> + <protected-broadcast android:name="android.intent.action.HDMI_AUDIO_PLUG" /> + <protected-broadcast android:name="android.intent.action.USB_AUDIO_ACCESSORY_PLUG" /> + <protected-broadcast android:name="android.intent.action.USB_AUDIO_DEVICE_PLUG" /> + <protected-broadcast android:name="android.net.conn.CONNECTIVITY_CHANGE" /> <protected-broadcast android:name="android.net.conn.CONNECTIVITY_CHANGE_IMMEDIATE" /> |