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

Commit 96884741 authored by Mike Ma's avatar Mike Ma
Browse files

Downgrade error level when proc file is empty 

Use Slog.w instead of Slog.wtf for a few empty cases when reading
proc files.

There have been quite a few issues around reporting error at Slog
.wtf level in the past. Although Slog.wtf should not crash itself,
it has indirectly caused a few crashes due to improper handling of
wtf errors e.g. arose from incorrectly mocking BatteryStatsImpl.

Test: Manual
Change-Id: Idce018c928a1bb0f3d4c139382d090be009c291d
parent 2e63cedc

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

+16 −7
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ public abstract class KernelCpuUidTimeReader<T> { 
        }



        private long[] readFreqs(String line) {

            if (line == null) {

            if (line == null || line.trim().isEmpty()) {

                return null;

            }

            final String[] lineArray = line.split(" ");
@@ -620,14 +620,18 @@ public abstract class KernelCpuUidTimeReader<T> { 
                return true;

            }



            String str = line.toString();

            String str = line.toString().trim();

            if (str.isEmpty()) {

                Slog.w(mTag, "Empty uid_concurrent_active_time");

                return false;

            }

            if (!str.startsWith("cpus:")) {

                Slog.wtf(mTag, "Malformed uid_concurrent_active_time line: " + line);

                Slog.wtf(mTag, "Malformed uid_concurrent_active_time line: " + str);

                return false;

            }

            int cores = Integer.parseInt(str.substring(5).trim(), 10);

            if (cores <= 0) {

                Slog.wtf(mTag, "Malformed uid_concurrent_active_time line: " + line);

                Slog.wtf(mTag, "Malformed uid_concurrent_active_time line: " + str);

                return false;

            }

            mCores = cores;
@@ -750,17 +754,22 @@ public abstract class KernelCpuUidTimeReader<T> { 
            if (mNumClusters > 0) {

                return true;

            }

            String lineStr = line.toString().trim();

            if (lineStr.isEmpty()) {

                Slog.w(mTag, "Empty uid_concurrent_policy_time");

                return false;

            }

            // Parse # cores in clusters.

            String[] lineArray = line.toString().split(" ");

            String[] lineArray = lineStr.split(" ");

            if (lineArray.length % 2 != 0) {

                Slog.wtf(mTag, "Malformed uid_concurrent_policy_time line: " + line);

                Slog.wtf(mTag, "Malformed uid_concurrent_policy_time line: " + lineStr);

                return false;

            }

            int[] clusters = new int[lineArray.length / 2];

            int cores = 0;

            for (int i = 0; i < clusters.length; i++) {

                if (!lineArray[i * 2].startsWith("policy")) {

                    Slog.wtf(mTag, "Malformed uid_concurrent_policy_time line: " + line);

                    Slog.wtf(mTag, "Malformed uid_concurrent_policy_time line: " + lineStr);

                    return false;

                }

                clusters[i] = Integer.parseInt(lineArray[i * 2 + 1], 10);