Merge "Clear TestableLoopers in SysuiTestCase" into tm-qpr-dev

2022-12-02 14:38:01 +00:00
parent bb1f34c1b7 669b633e9d
commit 78f5ef56e1
1 changed files with 2 additions and 0 deletions
--- a/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java
+++ b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java
@@ -136,6 +136,8 @@ public abstract class SysuiTestCase {
                InstrumentationRegistry.getArguments());
        if (TestableLooper.get(this) != null) {
            TestableLooper.get(this).processAllMessages();
+            // Must remove static reference to this test object to prevent leak (b/261039202)
+            TestableLooper.remove(this);
        }
        disallowTestableLooperAsMainThread();
        mContext.cleanUpReceivers(this.getClass().getSimpleName());