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

Commit 17d7d9dc authored by Bookatz's avatar Bookatz Committed by Adam Bookatz
Browse files

Batterystats logs smeared power model values 

Fixes: 62302932
Test: cts-tradefed run cts-dev -m CtsDumpsysHostTestCases -t android.dumpsys.cts.BatteryStatsDumpsysTest
Change-Id: I8942aa9bc557fada4cf0be76aee6bd0bcee9ebb6
parent 5dad8068

core/java/android/os/BatteryStats.java

+24 −1
Original line number Diff line number Diff line
@@ -3332,7 +3332,10 @@ public abstract class BatteryStats implements Parcelable { 
                        label = "???";

                }

                dumpLine(pw, uid, category, POWER_USE_ITEM_DATA, label,

                        BatteryStatsHelper.makemAh(bs.totalPowerMah));

                        BatteryStatsHelper.makemAh(bs.totalPowerMah),

                        bs.shouldHide ? 1 : 0,

                        BatteryStatsHelper.makemAh(bs.screenPowerMah),

                        BatteryStatsHelper.makemAh(bs.proportionalSmearMah));

            }

        }
@@ -4362,6 +4365,26 @@ public abstract class BatteryStats implements Parcelable { 
                    }

                    pw.print(" )");

                }



                // If there is additional smearing information, include it.

                if (bs.totalSmearedPowerMah != bs.totalPowerMah) {

                    pw.print(" Including smearing: ");

                    printmAh(pw, bs.totalSmearedPowerMah);

                    pw.print(" (");

                    if (bs.screenPowerMah != 0) {

                        pw.print(" screen=");

                        printmAh(pw, bs.screenPowerMah);

                    }

                    if (bs.proportionalSmearMah != 0) {

                        pw.print(" proportional=");

                        printmAh(pw, bs.proportionalSmearMah);

                    }

                    pw.print(" )");

                }

                if (bs.shouldHide) {

                    pw.print(" Excluded from smearing");

                }



                pw.println();

            }

            pw.println();