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

Commit e0d6b001 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android (Google) Code Review
Browse files

Merge "Remove dependency of BatteryUsageStats on com.android.internal.os.PowerCalculator"

parents a36389a7 cf1206ed

core/java/android/os/BatteryUsageStats.java

+4 −5
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.util.proto.ProtoOutputStream; 


import com.android.internal.os.BatteryStatsHistory;

import com.android.internal.os.BatteryStatsHistoryIterator;

import com.android.internal.os.PowerCalculator;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -539,15 +538,15 @@ public final class BatteryUsageStats implements Parcelable, Closeable { 
        pw.println("  Estimated power use (mAh):");

        pw.print(prefix);

        pw.print("    Capacity: ");

        PowerCalculator.printPowerMah(pw, getBatteryCapacity());

        pw.print(BatteryStats.formatCharge(getBatteryCapacity()));

        pw.print(", Computed drain: ");

        PowerCalculator.printPowerMah(pw, getConsumedPower());

        pw.print(BatteryStats.formatCharge(getConsumedPower()));

        final Range<Double> dischargedPowerRange = getDischargedPowerRange();

        pw.print(", actual drain: ");

        PowerCalculator.printPowerMah(pw, dischargedPowerRange.getLower());

        pw.print(BatteryStats.formatCharge(dischargedPowerRange.getLower()));

        if (!dischargedPowerRange.getLower().equals(dischargedPowerRange.getUpper())) {

            pw.print("-");

            PowerCalculator.printPowerMah(pw, dischargedPowerRange.getUpper());

            pw.print(BatteryStats.formatCharge(dischargedPowerRange.getUpper()));

        }

        pw.println();

core/java/android/os/UidBatteryConsumer.java

+1 −3
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import android.text.TextUtils; 
import android.util.TypedXmlPullParser;

import android.util.TypedXmlSerializer;



import com.android.internal.os.PowerCalculator;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -109,7 +107,7 @@ public final class UidBatteryConsumer extends BatteryConsumer { 
        pw.print("UID ");

        UserHandle.formatUid(pw, getUid());

        pw.print(": ");

        PowerCalculator.printPowerMah(pw, getConsumedPower());

        pw.print(BatteryStats.formatCharge(getConsumedPower()));



        if (mData.layout.processStateDataIncluded) {

            StringBuilder sb = new StringBuilder();

core/java/android/os/UserBatteryConsumer.java

+1 −3
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ import android.annotation.NonNull; 
import android.util.TypedXmlPullParser;

import android.util.TypedXmlSerializer;



import com.android.internal.os.PowerCalculator;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -60,7 +58,7 @@ public class UserBatteryConsumer extends BatteryConsumer { 
        pw.print("User ");

        pw.print(getUserId());

        pw.print(": ");

        PowerCalculator.printPowerMah(pw, consumedPower);

        pw.print(BatteryStats.formatCharge(consumedPower));

        pw.print(" ( ");

        mPowerComponents.dump(pw, skipEmptyComponents  /* skipTotalPowerComponent */);

        pw.print(" ) ");