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

am b11c9737: Fix issue #15597136: n7 not showing estimated discharge time

Browse Source 
* commit 'b11c97379918fce423bfb0b96a8319a8e698845d':
  Fix issue #15597136: n7 not showing estimated discharge time
This commit is contained in:
Dianne Hackborn
2014-06-12 23:57:20 +00:00
committed by Android Git Automerger
parent 204521626f b11c973799
commit dd1ad04de2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/fuelgauge/BatteryHistoryChart.java
View File

@@ -489,11 +489,9 @@ public class BatteryHistoryChart extends View {
R.string.percentage, 0); R.string.percentage, 0);
int batteryLevel = com.android.settings.Utils.getBatteryLevel(mBatteryBroadcast); int batteryLevel = com.android.settings.Utils.getBatteryLevel(mBatteryBroadcast);
final int status = mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_STATUS,
BatteryManager.BATTERY_STATUS_UNKNOWN);
long remainingTimeUs = 0; long remainingTimeUs = 0;
mDischarging = true; mDischarging = true;
if (status == BatteryManager.BATTERY_STATUS_DISCHARGING) { if (mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) == 0) {
final long drainTime = mStats.computeBatteryTimeRemaining(elapsedRealtimeUs); final long drainTime = mStats.computeBatteryTimeRemaining(elapsedRealtimeUs);
if (drainTime > 0) { if (drainTime > 0) {
remainingTimeUs = drainTime; remainingTimeUs = drainTime;
@@ -509,6 +507,8 @@ public class BatteryHistoryChart extends View {
final long chargeTime = mStats.computeChargeTimeRemaining(elapsedRealtimeUs); final long chargeTime = mStats.computeChargeTimeRemaining(elapsedRealtimeUs);
final String statusLabel = com.android.settings.Utils.getBatteryStatus(getResources(), final String statusLabel = com.android.settings.Utils.getBatteryStatus(getResources(),
mBatteryBroadcast); mBatteryBroadcast);
final int status = mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_STATUS,
BatteryManager.BATTERY_STATUS_UNKNOWN);
if (chargeTime > 0 && status != BatteryManager.BATTERY_STATUS_FULL) { if (chargeTime > 0 && status != BatteryManager.BATTERY_STATUS_FULL) {
mDischarging = false; mDischarging = false;
remainingTimeUs = chargeTime; remainingTimeUs = chargeTime;