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

Commit da026f2d authored by Kweku Adams's avatar Kweku Adams Committed by android-build-merger
Browse files

Merge "Only print out services if they did something." into pi-dev am: 3c0f0b3e 

am: f2e9567d

Change-Id: Ic537fd85096f9fc410ff2ba9bcfcdea736121470
parents 131f8d09 f2e9567d

core/java/android/os/BatteryStats.java

+11 −4
Original line number Diff line number Diff line
@@ -7138,13 +7138,20 @@ public abstract class BatteryStats implements Parcelable { 


                for (int isvc = serviceStats.size() - 1; isvc >= 0; --isvc) {

                    final BatteryStats.Uid.Pkg.Serv ss = serviceStats.valueAt(isvc);



                    final long startTimeMs = roundUsToMs(ss.getStartTime(batteryUptimeUs, which));

                    final int starts = ss.getStarts(which);

                    final int launches = ss.getLaunches(which);

                    if (startTimeMs == 0 && starts == 0 && launches == 0) {

                        continue;

                    }



                    long sToken = proto.start(UidProto.Package.SERVICES);



                    proto.write(UidProto.Package.Service.NAME, serviceStats.keyAt(isvc));

                    proto.write(UidProto.Package.Service.START_DURATION_MS,

                            roundUsToMs(ss.getStartTime(batteryUptimeUs, which)));

                    proto.write(UidProto.Package.Service.START_COUNT, ss.getStarts(which));

                    proto.write(UidProto.Package.Service.LAUNCH_COUNT, ss.getLaunches(which));

                    proto.write(UidProto.Package.Service.START_DURATION_MS, startTimeMs);

                    proto.write(UidProto.Package.Service.START_COUNT, starts);

                    proto.write(UidProto.Package.Service.LAUNCH_COUNT, launches);



                    proto.end(sToken);

                }