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 am: e70c76e281

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

Change-Id: Idbf0634d489404fc363aa592d803b1f28665d928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jeff Chen
2023-01-18 01:51:57 +00:00
committed by Automerger Merge Worker
parent 9ae44d928c e70c76e281
commit ed29280b5c
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 @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)