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

Commit 14f3d223 authored by Kweku Adams's avatar Kweku Adams
Browse files

Only print out services if they did something. 

This also fixes a failing CTS test.

Bug: 74975371
Bug: 73490092
Test: flash device and check incident.proto output
Change-Id: I4d0f7d1b45b1b620d903f4b46cbdc04dfe314958
parent c7f6eadf

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);

                }