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

Commit 4c007a13 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Teaches the ProcessCpuTracker about USAPs." am: 3bc51682 am: 1ccb15b7 am: 3ceb4bd3 

Change-Id: If5201fbe5d198fa9f2db81ae873540ff07a9b56e
parents 0b54a9ba 3ceb4bd3

core/java/com/android/internal/os/ProcessCpuTracker.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -945,8 +945,11 @@ public class ProcessCpuTracker { 




    private void getName(Stats st, String cmdlineFile) {

    private void getName(Stats st, String cmdlineFile) {

        String newName = st.name;

        String newName = st.name;

        if (st.name == null || st.name.equals("app_process")

        if (st.name == null

                || st.name.equals("<pre-initialized>")) {

                || st.name.equals("app_process")

                || st.name.equals("<pre-initialized>")

                || st.name.equals("usap32")

                || st.name.equals("usap64")) {

            String cmdName = ProcStatsUtil.readTerminatedProcFile(cmdlineFile, (byte) '\0');

            String cmdName = ProcStatsUtil.readTerminatedProcFile(cmdlineFile, (byte) '\0');

            if (cmdName != null && cmdName.length() > 1) {

            if (cmdName != null && cmdName.length() > 1) {

                newName = cmdName;

                newName = cmdName;