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

Commit ed29280b authored by Jeff Chen's avatar Jeff Chen Committed by Automerger Merge Worker
Browse files

Merge "Avoid un-registration when mRealInstrumentation is null." into tm-qpr-dev am: e70c76e2 

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



Change-Id: Idbf0634d489404fc363aa592d803b1f28665d928
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ae44d92 e70c76e2

packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java

+4 −2
Original line number Diff line number Diff line
@@ -132,8 +132,10 @@ public abstract class SysuiTestCase { 


    @After

    public void SysuiTeardown() {

        if (mRealInstrumentation != null) {

            InstrumentationRegistry.registerInstance(mRealInstrumentation,

                    InstrumentationRegistry.getArguments());

        }

        if (TestableLooper.get(this) != null) {

            TestableLooper.get(this).processAllMessages();

            // Must remove static reference to this test object to prevent leak (b/261039202)