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

Merge "Fix a memory leak in UidState." into tm-qpr-dev am: 42b71cc155

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

Change-Id: I6b87eddab8ad1bb358fa113dcc0ed0bdfca40e2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yu-Ting Tseng
2023-03-22 13:34:57 +00:00
committed by Automerger Merge Worker
parent 4d1ed69aa8 42b71cc155
commit 5367bd7bc3
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/com/android/internal/app/procstats/UidState.java
View File

@@ -150,6 +150,7 @@ public final class UidState {
public void resetSafely(long now) {
mDurations.resetTable();
mStartTime = now;
mProcesses.removeIf(p -> !p.isInUse());
}
/**

15
core/tests/coretests/src/com/android/internal/app/procstats/ProcessStatsTest.java
View File

@@ -186,4 +186,19 @@ public class ProcessStatsTest extends TestCase {
eq(0),
eq(APP_1_PROCESS_NAME));
}
@SmallTest
public void testSafelyResetClearsProcessInUidState() throws Exception {
ProcessStats processStats = new ProcessStats();
ProcessState processState =
processStats.getProcessStateLocked(
APP_1_PACKAGE_NAME, APP_1_UID, APP_1_VERSION, APP_1_PROCESS_NAME);
processState.makeActive();
UidState uidState = processStats.mUidStates.get(APP_1_UID);
assertTrue(uidState.isInUse());
processState.makeInactive();
uidState.resetSafely(NOW_MS);
processState.makeActive();
assertFalse(uidState.isInUse());
}
}