diff options
author | Mike Lockwood <lockwood@android.com> | 2011-03-14 13:37:54 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 13:37:54 -0700 |
commit | ccdac700df7089a87e6bf284e45a30a7a6a62602 (patch) | |
tree | 2ddc5f0f05f5906dbe9d7fbb980be2e6a48d143f /core/java/android/app | |
parent | 81e1ed7eb5e02edf714cd5f416d1f6ebeaeebae0 (diff) | |
parent | 78b8e1be97c61f7e0b28b145fadd0c646fd1c46b (diff) | |
download | frameworks_base-ccdac700df7089a87e6bf284e45a30a7a6a62602.zip frameworks_base-ccdac700df7089a87e6bf284e45a30a7a6a62602.tar.gz frameworks_base-ccdac700df7089a87e6bf284e45a30a7a6a62602.tar.bz2 |
am 78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread
* commit '78b8e1be97c61f7e0b28b145fadd0c646fd1c46b':
DO NOT MERGE: backport recent USB accessory changes from honeycomb
Diffstat (limited to 'core/java/android/app')
-rw-r--r-- | core/java/android/app/ContextImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index f32c230..0e473c9 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -1155,7 +1155,7 @@ class ContextImpl extends Context { if (mUsbManager == null) { IBinder b = ServiceManager.getService(USB_SERVICE); IUsbManager service = IUsbManager.Stub.asInterface(b); - mUsbManager = new UsbManager(service); + mUsbManager = new UsbManager(this, service); } } return mUsbManager; |