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

Commit 9a37e8e8 authored by Yi Jin's avatar Yi Jin Committed by Android (Google) Code Review
Browse files

Merge "Remove number of Wake Kills, it is safe to change proto numbers since... 

Merge "Remove number of Wake Kills, it is safe to change proto numbers since nothing is being used now."
parents b62fcc6d dca43272

core/java/com/android/internal/app/procstats/ProcessState.java

+0 −1
Original line number Diff line number Diff line
@@ -1181,7 +1181,6 @@ public final class ProcessState { 
        proto.write(ProcessStatsProto.UID, uid);

        if (mNumExcessiveCpu > 0 || mNumCachedKill > 0 ) {

            final long killToken = proto.start(ProcessStatsProto.KILL);

            proto.write(ProcessStatsProto.Kill.WAKES, mNumExcessiveWake);

            proto.write(ProcessStatsProto.Kill.CPU, mNumExcessiveCpu);

            proto.write(ProcessStatsProto.Kill.CACHED, mNumCachedKill);

            ProtoUtils.toAggStatsProto(proto, ProcessStatsProto.Kill.CACHED_PSS,

core/proto/android/service/procstats.proto

+3 −6
Original line number Diff line number Diff line
@@ -88,17 +88,14 @@ message ProcessStatsProto { 


    // Information about how often kills occurred

    message Kill {

      // Count of excessive wakes kills

      int32 wakes = 1;



      // Count of excessive CPU kills

      int32 cpu = 2;

      int32 cpu = 1;



      // Count of kills when cached

      int32 cached = 3;

      int32 cached = 2;



      // PSS stats during cached kill

      android.util.AggStats cached_pss = 4;

      android.util.AggStats cached_pss = 3;

    }

    Kill kill = 3;