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

Merge "BatteryStats: Fix read/write parcel order" into nyc-dev

Browse Source
This commit is contained in:
Adam Lesinski
2016-06-10 22:29:14 +00:00
committed by Android (Google) Code Review
parent be0bacda9b 67c134f849
commit e8a442ccd6
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/os/BatteryStats.java
View File

@@ -2836,8 +2836,8 @@ public abstract class BatteryStats implements Parcelable {
whichBatteryRealtime / 1000, whichBatteryUptime / 1000, whichBatteryRealtime / 1000, whichBatteryUptime / 1000,
totalRealtime / 1000, totalUptime / 1000, totalRealtime / 1000, totalUptime / 1000,
getStartClockTime(), getStartClockTime(),
whichBatteryScreenOffRealtime / 1000, whichBatteryScreenOffUptime / 1000, whichBatteryScreenOffRealtime / 1000, whichBatteryScreenOffUptime / 1000);
dischargeCount / 1000, dischargeScreenOffCount / 1000);
// Calculate wakelock times across all uids. // Calculate wakelock times across all uids.
long fullWakeLockTimeTotal = 0; long fullWakeLockTimeTotal = 0;
@@ -2987,12 +2987,14 @@ public abstract class BatteryStats implements Parcelable {
dumpLine(pw, 0 /* uid */, category, BATTERY_DISCHARGE_DATA, dumpLine(pw, 0 /* uid */, category, BATTERY_DISCHARGE_DATA,
getDischargeStartLevel()-getDischargeCurrentLevel(), getDischargeStartLevel()-getDischargeCurrentLevel(),
getDischargeStartLevel()-getDischargeCurrentLevel(), getDischargeStartLevel()-getDischargeCurrentLevel(),
getDischargeAmountScreenOn(), getDischargeAmountScreenOff()); getDischargeAmountScreenOn(), getDischargeAmountScreenOff(),
dischargeCount / 1000, dischargeScreenOffCount / 1000);
} else { } else {
dumpLine(pw, 0 /* uid */, category, BATTERY_DISCHARGE_DATA, dumpLine(pw, 0 /* uid */, category, BATTERY_DISCHARGE_DATA,
getLowDischargeAmountSinceCharge(), getHighDischargeAmountSinceCharge(), getLowDischargeAmountSinceCharge(), getHighDischargeAmountSinceCharge(),
getDischargeAmountScreenOnSinceCharge(), getDischargeAmountScreenOnSinceCharge(),
getDischargeAmountScreenOffSinceCharge()); getDischargeAmountScreenOffSinceCharge(),
dischargeCount / 1000, dischargeScreenOffCount / 1000);
} }
if (reqUid < 0) { if (reqUid < 0) {

6
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -108,7 +108,7 @@ public class BatteryStatsImpl extends BatteryStats {
private static final int MAGIC = 0xBA757475; // 'BATSTATS' private static final int MAGIC = 0xBA757475; // 'BATSTATS'
// Current on-disk Parcel version // Current on-disk Parcel version
private static final int VERSION = 145 + (USE_OLD_HISTORY ? 1000 : 0); private static final int VERSION = 146 + (USE_OLD_HISTORY ? 1000 : 0);
// Maximum number of items we will record in the history. // Maximum number of items we will record in the history.
private static final int MAX_HISTORY_ITEMS = 2000; private static final int MAX_HISTORY_ITEMS = 2000;
@@ -10451,10 +10451,10 @@ public class BatteryStatsImpl extends BatteryStats {
out.writeInt(getDischargeAmountScreenOffSinceCharge()); out.writeInt(getDischargeAmountScreenOffSinceCharge());
mDischargeStepTracker.writeToParcel(out); mDischargeStepTracker.writeToParcel(out);
mChargeStepTracker.writeToParcel(out); mChargeStepTracker.writeToParcel(out);
mDischargeCounter.writeSummaryFromParcelLocked(out);
mDischargeScreenOffCounter.writeSummaryFromParcelLocked(out);
mDailyDischargeStepTracker.writeToParcel(out); mDailyDischargeStepTracker.writeToParcel(out);
mDailyChargeStepTracker.writeToParcel(out); mDailyChargeStepTracker.writeToParcel(out);
mDischargeCounter.writeSummaryFromParcelLocked(out);
mDischargeScreenOffCounter.writeSummaryFromParcelLocked(out);
if (mDailyPackageChanges != null) { if (mDailyPackageChanges != null) {
final int NPKG = mDailyPackageChanges.size(); final int NPKG = mDailyPackageChanges.size();
out.writeInt(NPKG); out.writeInt(NPKG);