Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 860e09dd authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

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

am: e8a442cc

Change-Id: I08f02adc6014ff9bcae60f60a091bba74695488d
parents 3ff43c5f e8a442cc

core/java/android/os/BatteryStats.java

+6 −4
Original line number Diff line number Diff line
@@ -2836,8 +2836,8 @@ public abstract class BatteryStats implements Parcelable { 
                whichBatteryRealtime / 1000, whichBatteryUptime / 1000,

                totalRealtime / 1000, totalUptime / 1000,

                getStartClockTime(),

                whichBatteryScreenOffRealtime / 1000, whichBatteryScreenOffUptime / 1000,

                dischargeCount / 1000, dischargeScreenOffCount / 1000);

                whichBatteryScreenOffRealtime / 1000, whichBatteryScreenOffUptime / 1000);



        

        // Calculate wakelock times across all uids.

        long fullWakeLockTimeTotal = 0;
@@ -2987,12 +2987,14 @@ public abstract class BatteryStats implements Parcelable { 
            dumpLine(pw, 0 /* uid */, category, BATTERY_DISCHARGE_DATA,

                    getDischargeStartLevel()-getDischargeCurrentLevel(),

                    getDischargeStartLevel()-getDischargeCurrentLevel(),

                    getDischargeAmountScreenOn(), getDischargeAmountScreenOff());

                    getDischargeAmountScreenOn(), getDischargeAmountScreenOff(),

                    dischargeCount / 1000, dischargeScreenOffCount / 1000);

        } else {

            dumpLine(pw, 0 /* uid */, category, BATTERY_DISCHARGE_DATA,

                    getLowDischargeAmountSinceCharge(), getHighDischargeAmountSinceCharge(),

                    getDischargeAmountScreenOnSinceCharge(),

                    getDischargeAmountScreenOffSinceCharge());

                    getDischargeAmountScreenOffSinceCharge(),

                    dischargeCount / 1000, dischargeScreenOffCount / 1000);

        }

        

        if (reqUid < 0) {

core/java/com/android/internal/os/BatteryStatsImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public class BatteryStatsImpl extends BatteryStats { 
    private static final int MAGIC = 0xBA757475; // 'BATSTATS'



    // 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.

    private static final int MAX_HISTORY_ITEMS = 2000;
@@ -10451,10 +10451,10 @@ public class BatteryStatsImpl extends BatteryStats { 
        out.writeInt(getDischargeAmountScreenOffSinceCharge());

        mDischargeStepTracker.writeToParcel(out);

        mChargeStepTracker.writeToParcel(out);

        mDischargeCounter.writeSummaryFromParcelLocked(out);

        mDischargeScreenOffCounter.writeSummaryFromParcelLocked(out);

        mDailyDischargeStepTracker.writeToParcel(out);

        mDailyChargeStepTracker.writeToParcel(out);

        mDischargeCounter.writeSummaryFromParcelLocked(out);

        mDischargeScreenOffCounter.writeSummaryFromParcelLocked(out);

        if (mDailyPackageChanges != null) {

            final int NPKG = mDailyPackageChanges.size();

            out.writeInt(NPKG);