summaryrefslogtreecommitdiffstats
path: root/core/res/AndroidManifest.xml
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-02-16 12:42:35 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-16 12:42:35 -0800
commit984dd8a206e782027c2b0c866aa845e6d236f218 (patch)
treebc19dd5e86fe963321b06b72b09479a6a6725907 /core/res/AndroidManifest.xml
parentca20af0c2990a969f1a793821d2ee239b0310d45 (diff)
parent9182d3c4eb1f9065cb33df5a3594969dd0d42acc (diff)
downloadframeworks_base-984dd8a206e782027c2b0c866aa845e6d236f218.zip
frameworks_base-984dd8a206e782027c2b0c866aa845e6d236f218.tar.gz
frameworks_base-984dd8a206e782027c2b0c866aa845e6d236f218.tar.bz2
Merge "UsbManager: New APIs for USB accessories"
Diffstat (limited to 'core/res/AndroidManifest.xml')
-rw-r--r--core/res/AndroidManifest.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 8e8383a..1df6fe5 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -82,9 +82,9 @@
<protected-broadcast android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
<protected-broadcast android:name="android.bluetooth.device.action.PAIRING_CANCEL" />
- <protected-broadcast android:name="android.hardware.action.USB_CONNECTED" />
- <protected-broadcast android:name="android.hardware.action.USB_DISCONNECTED" />
<protected-broadcast android:name="android.hardware.action.USB_STATE" />
+ <protected-broadcast android:name="android.hardware.action.USB_ACCESSORY_ATTACHED" />
+ <protected-broadcast android:name="android.hardware.action.USB_ACCESSORY_ATTACHED" />
<protected-broadcast android:name="android.hardware.action.USB_DEVICE_ATTACHED" />
<protected-broadcast android:name="android.hardware.action.USB_DEVICE_DETACHED" />