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

Commit 986950e0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "KernelCpuUidBpfMapReader: Verify presence of Uids before deleting" am:... 

Merge "KernelCpuUidBpfMapReader: Verify presence of Uids before deleting" am: 90712460 am: 5f016c8d am: b736478a am: 2d8aceac am: 12aefae3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321018

Change-Id: I2da4e9d66318454e8fcc21dac4818e4e7bc26a4a
parents e461c3ef 12aefae3

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

+12 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.internal.os;



import android.os.StrictMode;

import android.os.SystemClock;

import android.util.Slog;

import android.util.SparseArray;
@@ -90,9 +89,21 @@ public abstract class KernelCpuUidBpfMapReader { 
        if (mErrors > ERROR_THRESHOLD) {

            return;

        }

        if (endUid < startUid || startUid < 0) {

            return;

        }



        mWriteLock.lock();

        int firstIndex = mData.indexOfKey(startUid);

        if (firstIndex < 0) {

            mData.put(startUid, null);

            firstIndex = mData.indexOfKey(startUid);

        }

        int lastIndex = mData.indexOfKey(endUid);

        if (lastIndex < 0) {

            mData.put(endUid, null);

            lastIndex = mData.indexOfKey(endUid);

        }

        mData.removeAtRange(firstIndex, lastIndex - firstIndex + 1);

        mWriteLock.unlock();

    }