PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix mistake in conditional + test" into oc-dr1-dev am: ab2d96de83

Browse Source 
am: 96e4b8f9f4

Change-Id: I751d0464ce85d6838bd045cbc431f3dc4c3b1405
This commit is contained in:
Salvador Martinez
2017-07-12 20:49:51 +00:00
committed by android-build-merger
parent 7d66e044d4 96e4b8f9f4
commit 42e65d11b9
2 changed files with 91 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fuelgauge/BatteryInfoLoader.java
View File

@@ -55,7 +55,7 @@ public class BatteryInfoLoader extends AsyncLoader<BatteryInfo>{
FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context);
// Stuff we always need to get BatteryInfo
Intent batteryBroadcast = getContext().registerReceiver(null,
Intent batteryBroadcast = context.registerReceiver(null,
new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
final long elapsedRealtimeUs = BatteryUtils.convertMsToUs(SystemClock.elapsedRealtime());
BatteryInfo batteryInfo;
@@ -79,7 +79,7 @@ public class BatteryInfoLoader extends AsyncLoader<BatteryInfo>{
} else {
batteryInfo = BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
elapsedRealtimeUs, false /* shortString */,
discharging ? 0 : stats.computeBatteryTimeRemaining(elapsedRealtimeUs),
discharging ? stats.computeBatteryTimeRemaining(elapsedRealtimeUs) : 0,
false /* basedOnUsage */);
}
BatteryUtils.logRuntime(LOG_TAG, "BatteryInfoLoader.loadInBackground", startTime);