summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/ContextImpl.java
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-03-14 13:17:24 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-14 13:17:24 -0700
commit78b8e1be97c61f7e0b28b145fadd0c646fd1c46b (patch)
tree148b8a36d980ebc0780d574d0d6ad3db4b596796 /core/java/android/app/ContextImpl.java
parentee3f6ef2fc7bcfae9d8af8430760388f653a10c8 (diff)
parent2cc0377200b94b2f68f34e34554f2aa39e09cbce (diff)
downloadframeworks_base-78b8e1be97c61f7e0b28b145fadd0c646fd1c46b.zip
frameworks_base-78b8e1be97c61f7e0b28b145fadd0c646fd1c46b.tar.gz
frameworks_base-78b8e1be97c61f7e0b28b145fadd0c646fd1c46b.tar.bz2
Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread
Diffstat (limited to 'core/java/android/app/ContextImpl.java')
-rw-r--r--core/java/android/app/ContextImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index fb9335b..46ad64c 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -1158,7 +1158,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;