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

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

Change-Id: Ia5a52212be0cb5924a0d90d86a4e2f87e73b85ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jeff Chen
2023-01-18 02:31:56 +00:00
committed by Automerger Merge Worker
parent b796b9e479 ed29280b5c
commit 21020e43a1
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)