Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "KernelCpuUidBpfMapReader: Verify presence of Uids before deleting" am: 907124607f am: 5f016c8deb am: b736478a80 am: 2d8aceac0a

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

Change-Id: I04df7616651b454f21ecc4f78f8583e8a8644d11
This commit is contained in:
Treehugger Robot
2020-06-08 16:46:47 +00:00
committed by Automerger Merge Worker
parent 06dfc47d1d 2d8aceac0a
commit 12aefae37e
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/com/android/internal/os/KernelCpuUidBpfMapReader.java
View File

@@ -16,7 +16,6 @@
package com.android.internal.os; package com.android.internal.os;
import android.os.StrictMode;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.Slog; import android.util.Slog;
import android.util.SparseArray; import android.util.SparseArray;
@@ -90,9 +89,21 @@ public abstract class KernelCpuUidBpfMapReader {
if (mErrors > ERROR_THRESHOLD) { if (mErrors > ERROR_THRESHOLD) {
return; return;
} }
if (endUid < startUid || startUid < 0) {
return;
}
mWriteLock.lock(); mWriteLock.lock();
int firstIndex = mData.indexOfKey(startUid); int firstIndex = mData.indexOfKey(startUid);
if (firstIndex < 0) {
mData.put(startUid, null);
firstIndex = mData.indexOfKey(startUid);
}
int lastIndex = mData.indexOfKey(endUid); int lastIndex = mData.indexOfKey(endUid);
if (lastIndex < 0) {
mData.put(endUid, null);
lastIndex = mData.indexOfKey(endUid);
}
mData.removeAtRange(firstIndex, lastIndex - firstIndex + 1); mData.removeAtRange(firstIndex, lastIndex - firstIndex + 1);
mWriteLock.unlock(); mWriteLock.unlock();
} }