summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mike Lockwood <lockwood@android.com> 2010-06-29 09:17:36 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-06-29 09:17:36 -0700
commit0d929d7f094f2ea743c9ce2e17d5e40780cfe757 (patch)
treeba54b4c892b10f4a88d725bea03d5a04e35aca9f
parent32b739b61ea92419942db5b8e556d6db26ea7f0e (diff)
parent059f009d970fb37ac4e408dcf8e1d2d2cdcf0a84 (diff)
am 059f009d: Make android.hardware.action.USB_STATE a protected broadcast.
Merge commit '059f009d970fb37ac4e408dcf8e1d2d2cdcf0a84' into gingerbread-plus-aosp * commit '059f009d970fb37ac4e408dcf8e1d2d2cdcf0a84': Make android.hardware.action.USB_STATE a protected broadcast.
-rw-r--r--core/res/AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index b1f81df7faf7..82f822f0dc67 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -82,6 +82,7 @@
<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" />
<!-- ====================================== -->
<!-- Permissions for things that cost money -->