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

Commit 59ed8d11 authored by Olivier Gaillard's avatar Olivier Gaillard
Browse files

Throws an exception there is a problem when collecting CPU metrics 

instead of returning empty data.

Test: manual
Change-Id: Ia4d3ca7c7e08089d8c0e35e70ba34712e94b5547
parent 3e555b6f

services/core/java/com/android/server/stats/StatsCompanionService.java

+13 −11
Original line number Original line Diff line number Diff line
@@ -1169,7 +1169,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
        BinderCallsStatsService.Internal binderStats =

        BinderCallsStatsService.Internal binderStats =

                LocalServices.getService(BinderCallsStatsService.Internal.class);

                LocalServices.getService(BinderCallsStatsService.Internal.class);

        if (binderStats == null) {

        if (binderStats == null) {

            return;

            throw new IllegalStateException("binderStats is null");

        }

        }





        List<ExportedCallStat> callStats = binderStats.getExportedCallStats();

        List<ExportedCallStat> callStats = binderStats.getExportedCallStats();
@@ -1200,7 +1200,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
        BinderCallsStatsService.Internal binderStats =

        BinderCallsStatsService.Internal binderStats =

                LocalServices.getService(BinderCallsStatsService.Internal.class);

                LocalServices.getService(BinderCallsStatsService.Internal.class);

        if (binderStats == null) {

        if (binderStats == null) {

            return;

            throw new IllegalStateException("binderStats is null");

        }

        }





        ArrayMap<String, Integer> exceptionStats = binderStats.getExportedExceptionStats();

        ArrayMap<String, Integer> exceptionStats = binderStats.getExportedExceptionStats();
@@ -1218,7 +1218,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
            List<StatsLogEventWrapper> pulledData) {

            List<StatsLogEventWrapper> pulledData) {

        LooperStats looperStats = LocalServices.getService(LooperStats.class);

        LooperStats looperStats = LocalServices.getService(LooperStats.class);

        if (looperStats == null) {

        if (looperStats == null) {

            return;

            throw new IllegalStateException("looperStats null");

        }

        }





        List<LooperStats.ExportedEntry> entries = looperStats.getEntries();

        List<LooperStats.ExportedEntry> entries = looperStats.getEntries();
@@ -1689,18 +1689,19 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
    private void pullCpuTimePerThreadFreq(int tagId, long elapsedNanos, long wallClockNanos,

    private void pullCpuTimePerThreadFreq(int tagId, long elapsedNanos, long wallClockNanos,

            List<StatsLogEventWrapper> pulledData) {

            List<StatsLogEventWrapper> pulledData) {

        if (this.mKernelCpuThreadReader == null) {

        if (this.mKernelCpuThreadReader == null) {

            return;

            throw new IllegalStateException("mKernelCpuThreadReader is null");

        }

        }

        ArrayList<KernelCpuThreadReader.ProcessCpuUsage> processCpuUsages =

        ArrayList<KernelCpuThreadReader.ProcessCpuUsage> processCpuUsages =

                this.mKernelCpuThreadReader.getProcessCpuUsageByUids();

                this.mKernelCpuThreadReader.getProcessCpuUsageByUids();

        if (processCpuUsages == null) {

        if (processCpuUsages == null) {

            return;

            throw new IllegalStateException("processCpuUsages is null");

        }

        }

        int[] cpuFrequencies = mKernelCpuThreadReader.getCpuFrequenciesKhz();

        int[] cpuFrequencies = mKernelCpuThreadReader.getCpuFrequenciesKhz();

        if (cpuFrequencies.length > CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES) {

        if (cpuFrequencies.length > CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES) {

            Slog.w(TAG, "Expected maximum " + CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES

            String message = "Expected maximum " + CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES

                    + " frequencies, but got " + cpuFrequencies.length);

                    + " frequencies, but got " + cpuFrequencies.length;

            return;

            Slog.w(TAG, message);

            throw new IllegalStateException(message);

        }

        }

        for (int i = 0; i < processCpuUsages.size(); i++) {

        for (int i = 0; i < processCpuUsages.size(); i++) {

            KernelCpuThreadReader.ProcessCpuUsage processCpuUsage = processCpuUsages.get(i);

            KernelCpuThreadReader.ProcessCpuUsage processCpuUsage = processCpuUsages.get(i);
@@ -1709,10 +1710,11 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
            for (int j = 0; j < threadCpuUsages.size(); j++) {

            for (int j = 0; j < threadCpuUsages.size(); j++) {

                KernelCpuThreadReader.ThreadCpuUsage threadCpuUsage = threadCpuUsages.get(j);

                KernelCpuThreadReader.ThreadCpuUsage threadCpuUsage = threadCpuUsages.get(j);

                if (threadCpuUsage.usageTimesMillis.length != cpuFrequencies.length) {

                if (threadCpuUsage.usageTimesMillis.length != cpuFrequencies.length) {

                    Slog.w(TAG, "Unexpected number of usage times,"

                    String message = "Unexpected number of usage times,"

                            + " expected " + cpuFrequencies.length

                            + " expected " + cpuFrequencies.length

                            + " but got " + threadCpuUsage.usageTimesMillis.length);

                            + " but got " + threadCpuUsage.usageTimesMillis.length;

                    continue;

                    Slog.w(TAG, message);

                    throw new IllegalStateException(message);

                }

                }





                StatsLogEventWrapper e =

                StatsLogEventWrapper e =