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

Commit 331a0b8d authored by Yu-Ting Tseng's avatar Yu-Ting Tseng Committed by Automerger Merge Worker
Browse files

Merge "Fix a memory leak in UidState." into udc-dev am: a5958f90 

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



Change-Id: I7a5e81ba2e4df825e66253f62a5b4a4c5bd74e05
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0e78856b a5958f90

core/java/com/android/internal/app/procstats/UidState.java

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ public final class UidState { 
    public void resetSafely(long now) {

        mDurations.resetTable();

        mStartTime = now;

        mProcesses.removeIf(p -> !p.isInUse());

    }



    /**

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

+15 −0
Original line number Diff line number Diff line
@@ -156,4 +156,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());

    }

}