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

Commit 834ed33f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixing proto field name style."

parents ec5af679 ef0c08fe

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

+2 −3
Original line number Diff line number Diff line
@@ -1410,7 +1410,6 @@ public final class ProcessState { 
                PssTable.writeStatsToProto(proto, mTotalRunningPss, 0);

            }

            proto.end(stateToken);



        }



        proto.end(token);

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

+0 −1
Original line number Diff line number Diff line
@@ -166,6 +166,5 @@ public class PssTable extends SparseMappingTable.Table { 
                stats[statsIndex + PSS_RSS_MINIMUM],

                stats[statsIndex + PSS_RSS_AVERAGE],

                stats[statsIndex + PSS_RSS_MAXIMUM]);



    }

}

core/proto/android/service/procstats.proto

+1 −1
Original line number Diff line number Diff line
@@ -177,5 +177,5 @@ message ProcessStatsProto { 


    // Total time process has been running...  screen_state, memory_state, and process_state

    // will not be set.

    optional State totalRunningState = 6;

    optional State total_running_state = 6;

}