summaryrefslogtreecommitdiffstats
path: root/device/battery
diff options
context:
space:
mode:
authoryfriedman <yfriedman@chromium.org>2015-05-12 10:55:20 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-12 17:56:09 +0000
commit9d93b73ca332fd8a6e9babe73415d6e388d1b1b7 (patch)
treee78b1c48fe47a7029e35b3a77a051d59f18ac959 /device/battery
parentb23448010805bf493f7a7104a73b378968b228da (diff)
downloadchromium_src-9d93b73ca332fd8a6e9babe73415d6e388d1b1b7.zip
chromium_src-9d93b73ca332fd8a6e9babe73415d6e388d1b1b7.tar.gz
chromium_src-9d93b73ca332fd8a6e9babe73415d6e388d1b1b7.tar.bz2
Retreive the BatteryManager as a system service.
BatteryManager is offered as a system service and Chrome should not be instantiating it. Updates the code to retrieve the correct instance. Review URL: https://codereview.chromium.org/1133253003 Cr-Commit-Position: refs/heads/master@{#329437}
Diffstat (limited to 'device/battery')
-rw-r--r--device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java b/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java
index d833b2c..10a9fc9 100644
--- a/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java
+++ b/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java
@@ -63,8 +63,9 @@ class BatteryStatusManager {
// BatteryManager.EXTRA_PRESENT appears to be unreliable on Galaxy Nexus,
// Android 4.2.1, it always reports false. See http://crbug.com/384348.
this(context, callback, Build.MODEL.equals("Galaxy Nexus"),
- Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ? new BatteryManager()
- : null);
+ Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
+ ? (BatteryManager) context.getSystemService(Context.BATTERY_SERVICE)
+ : null);
}
/**