diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2012-01-25 16:14:50 -0800 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2012-07-13 22:22:51 -0700 |
| commit | 1abb1cb3a8fe17f7866150604c2fd73751da787e (patch) | |
| tree | a2f4fa365665fc5b25fc66c6f7b90ea3ca719cfc /core/java/android/app/ContextImpl.java | |
| parent | 34196187365687d3f144a6de5fef811b52545ac0 (diff) | |
Changes to Bluetooth Service structure.
Changes to make Bluetooth Service part of the system_service.
These changes may be temporary.
Changes to update to the new disable API.
Change-Id: If89dba17e6e6c6daa53c37684221763a2da076e9
Conflicts:
services/java/com/android/server/pm/PackageManagerService.java
Diffstat (limited to 'core/java/android/app/ContextImpl.java')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 5e2140385ac3..44b8d3a268b4 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -18,6 +18,7 @@ package android.app; import com.android.internal.policy.PolicyManager; +import android.bluetooth.BluetoothAdapter; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.ContentResolver; @@ -294,6 +295,11 @@ class ContextImpl extends Context { return new MediaRouter(ctx); }}); + registerService(BLUETOOTH_SERVICE, new ServiceFetcher() { + public Object createService(ContextImpl ctx) { + return BluetoothAdapter.getDefaultAdapter(); + }}); + registerService(CLIPBOARD_SERVICE, new ServiceFetcher() { public Object createService(ContextImpl ctx) { return new ClipboardManager(ctx.getOuterContext(), |