diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-06-29 11:10:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-29 11:10:33 -0700 |
| commit | dad497e598de663c742289fe10dfa65c0cb154e9 (patch) | |
| tree | c84a615825d2e6b45b7a52f05ca18e12ed278b4f /core/res/AndroidManifest.xml | |
| parent | c5c2f5b5e54e261a84482309538a8359303a5826 (diff) | |
| parent | 0d929d7f094f2ea743c9ce2e17d5e40780cfe757 (diff) | |
| download | frameworks_base-dad497e598de663c742289fe10dfa65c0cb154e9.zip frameworks_base-dad497e598de663c742289fe10dfa65c0cb154e9.tar.gz frameworks_base-dad497e598de663c742289fe10dfa65c0cb154e9.tar.bz2 | |
am 0d929d7f: am 059f009d: Make android.hardware.action.USB_STATE a protected broadcast.
Merge commit '0d929d7f094f2ea743c9ce2e17d5e40780cfe757'
* commit '0d929d7f094f2ea743c9ce2e17d5e40780cfe757':
Make android.hardware.action.USB_STATE a protected broadcast.
Diffstat (limited to 'core/res/AndroidManifest.xml')
| -rw-r--r-- | core/res/AndroidManifest.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index e044c2a..a66fe86 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 --> |