diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java index bf2235aa98a9b..1bab99787de49 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java @@ -132,8 +132,10 @@ public abstract class SysuiTestCase { @After public void SysuiTeardown() { - InstrumentationRegistry.registerInstance(mRealInstrumentation, - InstrumentationRegistry.getArguments()); + 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)