Merge "Avoid un-registration when mRealInstrumentation is null." into tm-qpr-dev
This commit is contained in:
@@ -132,8 +132,10 @@ public abstract class SysuiTestCase {
|
|||||||
|
|
||||||
@After
|
@After
|
||||||
public void SysuiTeardown() {
|
public void SysuiTeardown() {
|
||||||
InstrumentationRegistry.registerInstance(mRealInstrumentation,
|
if (mRealInstrumentation != null) {
|
||||||
InstrumentationRegistry.getArguments());
|
InstrumentationRegistry.registerInstance(mRealInstrumentation,
|
||||||
|
InstrumentationRegistry.getArguments());
|
||||||
|
}
|
||||||
if (TestableLooper.get(this) != null) {
|
if (TestableLooper.get(this) != null) {
|
||||||
TestableLooper.get(this).processAllMessages();
|
TestableLooper.get(this).processAllMessages();
|
||||||
// Must remove static reference to this test object to prevent leak (b/261039202)
|
// Must remove static reference to this test object to prevent leak (b/261039202)
|
||||||
|
|||||||
Reference in New Issue
Block a user