diff options
| author | Todd Poynor <toddpoynor@google.com> | 2014-04-15 22:16:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-15 22:16:13 +0000 |
| commit | 7a8e3fcd3c33d56e0010ad0da52bc1aae6c065b8 (patch) | |
| tree | 2a1f51f727f293ce4f7ded67fc85ce85842a7ad5 /core/java/android/app/ContextImpl.java | |
| parent | 7ec8b21a06364357976b6b60a12a49b255ac39eb (diff) | |
| parent | e35872da97ac6bd07d2d9ac5af8a7c18ad290718 (diff) | |
| download | frameworks_base-7a8e3fcd3c33d56e0010ad0da52bc1aae6c065b8.zip frameworks_base-7a8e3fcd3c33d56e0010ad0da52bc1aae6c065b8.tar.gz frameworks_base-7a8e3fcd3c33d56e0010ad0da52bc1aae6c065b8.tar.bz2 | |
Merge "BatteryManager: Add API and service for battery property retrieval"
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 1c02102..f444680 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -82,6 +82,7 @@ import android.net.wifi.hotspot.WifiHotspotManager; import android.net.wifi.p2p.IWifiP2pManager; import android.net.wifi.p2p.WifiP2pManager; import android.nfc.NfcManager; +import android.os.BatteryManager; import android.os.Binder; import android.os.Bundle; import android.os.Debug; @@ -404,6 +405,11 @@ class ContextImpl extends Context { return new DownloadManager(ctx.getContentResolver(), ctx.getPackageName()); }}); + registerService(BATTERY_SERVICE, new ServiceFetcher() { + public Object createService(ContextImpl ctx) { + return new BatteryManager(); + }}); + registerService(NFC_SERVICE, new ServiceFetcher() { public Object createService(ContextImpl ctx) { return new NfcManager(ctx); |