Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BatteryStats: Remove too-verbose logging" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-06 02:38:52 +00:00
committed by Android (Google) Code Review
parent 05b8b4135a 639345210b
commit 09612f9435
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/core/java/com/android/server/am/BatteryStatsService.java
View File

@@ -1021,32 +1021,24 @@ public final class BatteryStatsService extends IBatteryStats.Stub
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
Slog.d(TAG, "begin setBatteryStateLocked"); synchronized (mStats) {
try { final boolean onBattery = plugType == BatteryStatsImpl.BATTERY_PLUGGED_NONE;
synchronized (mStats) { if (mStats.isOnBattery() == onBattery) {
final boolean onBattery = plugType == BatteryStatsImpl.BATTERY_PLUGGED_NONE; // The battery state has not changed, so we don't need to sync external
if (mStats.isOnBattery() == onBattery) { // stats immediately.
// The battery state has not changed, so we don't need to sync external mStats.setBatteryStateLocked(status, health, plugType, level, temp, volt,
// stats immediately. chargeUAh, chargeFullUAh);
mStats.setBatteryStateLocked(status, health, plugType, level, temp, return;
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 // 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. // immediately here, we may not collect the relevant data later.
updateExternalStatsSync("battery-state", BatteryStatsImpl.ExternalStatsSync.UPDATE_ALL); updateExternalStatsSync("battery-state", BatteryStatsImpl.ExternalStatsSync.UPDATE_ALL);
Slog.d(TAG, "begin setBatteryStateLocked");
synchronized (mStats) { synchronized (mStats) {
mStats.setBatteryStateLocked(status, health, plugType, level, temp, volt, mStats.setBatteryStateLocked(status, health, plugType, level, temp, volt,
chargeUAh, chargeFullUAh); chargeUAh, chargeFullUAh);
} }
Slog.d(TAG, "end setBatteryStateLocked");
} }
}); });
} }