diff options
| -rw-r--r-- | services/core/java/com/android/server/am/BatteryStatsService.java | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index e5b2ecad2842..983c97510687 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -1021,32 +1021,24 @@ public final class BatteryStatsService extends IBatteryStats.Stub mHandler.post(new Runnable() { @Override public void run() { - Slog.d(TAG, "begin setBatteryStateLocked"); - try { - synchronized (mStats) { - final boolean onBattery = plugType == BatteryStatsImpl.BATTERY_PLUGGED_NONE; - if (mStats.isOnBattery() == onBattery) { - // The battery state has not changed, so we don't need to sync external - // stats immediately. - mStats.setBatteryStateLocked(status, health, plugType, level, temp, - volt, - chargeUAh, chargeFullUAh); - return; - } + synchronized (mStats) { + final boolean onBattery = plugType == BatteryStatsImpl.BATTERY_PLUGGED_NONE; + if (mStats.isOnBattery() == onBattery) { + // The battery state has not changed, so we don't need to sync external + // stats immediately. + mStats.setBatteryStateLocked(status, health, plugType, level, temp, volt, + chargeUAh, chargeFullUAh); + return; } - } finally { - Slog.d(TAG, "end setBatteryStateLocked"); } // Sync external stats first as the battery has changed states. If we don't sync // immediately here, we may not collect the relevant data later. updateExternalStatsSync("battery-state", BatteryStatsImpl.ExternalStatsSync.UPDATE_ALL); - Slog.d(TAG, "begin setBatteryStateLocked"); synchronized (mStats) { mStats.setBatteryStateLocked(status, health, plugType, level, temp, volt, chargeUAh, chargeFullUAh); } - Slog.d(TAG, "end setBatteryStateLocked"); } }); } |