Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeff Chen
2023-01-18 01:34:41 +00:00
committed by Android (Google) Code Review
parent 6f9c227d29 1e2d624576
commit e70c76e281
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)