LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove an NPE in tearDown" into main

Browse Source
This commit is contained in:
Jean Chalard
2023-10-05 02:44:59 +00:00
committed by Gerrit Code Review
parent f24beefe55 ec0149f1ba
commit e7b7ceb70d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
View File

@@ -198,7 +198,8 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase {
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
executeShellCommand("cmd netpolicy stop-watching"); executeShellCommand("cmd netpolicy stop-watching");
mServiceClient.unbind(); mServiceClient.unbind();
if (mLock.isHeld()) mLock.release(); final PowerManager.WakeLock lock = mLock;
if (null != lock && lock.isHeld()) lock.release();
} }
protected int getUid(String packageName) throws Exception { protected int getUid(String packageName) throws Exception {