diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-09 03:52:47 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-09 03:52:47 -0800 |
| commit | 9e8e4ea0a839b561d329758cddbfd0f7ea23f593 (patch) | |
| tree | 5245dd205851ea4b68918accdb640467fac7ccf6 /core/java/android/app | |
| parent | 36b077d558727ead246434b08de0ce7b955508e1 (diff) | |
| parent | d591357524091254483849e37697255cc8fce2ad (diff) | |
| download | frameworks_base-9e8e4ea0a839b561d329758cddbfd0f7ea23f593.zip frameworks_base-9e8e4ea0a839b561d329758cddbfd0f7ea23f593.tar.gz frameworks_base-9e8e4ea0a839b561d329758cddbfd0f7ea23f593.tar.bz2 | |
Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1
* changes:
Close USB dialogs if their corresponding accessory or device has disconnected
USB: Add API and dialog for apps to request permissions for USB devices and accessories
UsbService: Automatically use system apps by default if it is the only choice
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 539e946..cc1f81c 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -401,10 +401,10 @@ class ContextImpl extends Context { return new UiModeManager(); }}); - registerService(USB_SERVICE, new StaticServiceFetcher() { - public Object createStaticService() { + registerService(USB_SERVICE, new ServiceFetcher() { + public Object createService(ContextImpl ctx) { IBinder b = ServiceManager.getService(USB_SERVICE); - return new UsbManager(IUsbManager.Stub.asInterface(b)); + return new UsbManager(ctx, IUsbManager.Stub.asInterface(b)); }}); registerService(VIBRATOR_SERVICE, new ServiceFetcher() { |