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

Commit 33dcf724 authored by Misha Wagner's avatar Misha Wagner Committed by Android (Google) Code Review
Browse files

Merge "Fix NullPointerException in KernelCpuThreadReaders."

parents 621a66a6 478c873f

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

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.internal.os;



import static com.android.internal.util.Preconditions.checkNotNull;



import android.annotation.Nullable;

import android.util.ArrayMap;

import android.util.Slog;
@@ -99,7 +101,7 @@ public class KernelCpuThreadReaderDiff { 


    @VisibleForTesting

    public KernelCpuThreadReaderDiff(KernelCpuThreadReader reader, int minimumTotalCpuUsageMillis) {

        mReader = reader;

        mReader = checkNotNull(reader);

        mMinimumTotalCpuUsageMillis = minimumTotalCpuUsageMillis;

        mPreviousCpuUsage = null;

    }

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

+4 −2
Original line number Diff line number Diff line
@@ -95,7 +95,9 @@ public class KernelCpuThreadReaderSettingsObserver extends ContentObserver { 
                KernelCpuThreadReader.create(

                        NUM_BUCKETS_DEFAULT, UidPredicate.fromString(COLLECTED_UIDS_DEFAULT));

        mKernelCpuThreadReaderDiff =

                new KernelCpuThreadReaderDiff(

                mKernelCpuThreadReader == null

                        ? null

                        : new KernelCpuThreadReaderDiff(

                                mKernelCpuThreadReader, MINIMUM_TOTAL_CPU_USAGE_MILLIS_DEFAULT);

    }