joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Remove an NPE in tearDown" into main am: e7b7ceb70d

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2770460

Change-Id: I017eafbc7dcf191cf6babcd3c43fa89a66546bbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jean Chalard 2023-10-05 03:07:15 +00:00 • committed by Automerger Merge Worker
commit ddd00cd23a
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

@ -199,7 +199,8 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase {
protected void tearDown() throws Exception {
executeShellCommand("cmd netpolicy stop-watching");
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 {