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

Commit 80408d06 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Teaches the ProcessCpuTracker about USAPs." am: 3bc51682 am: 1ccb15b7 am: 3ceb4bd3 am: 4c007a13 am: b9db7e93"
parents bdd8e7c5 efc57e43

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

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


    private void getName(Stats st, String cmdlineFile) {

        String newName = st.name;

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

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

        if (st.name == null

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

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

                newName = cmdName;