| commit | 3022442e713a56f516f907a4ae7d6827e6c46e50 | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Thu Oct 05 03:38:56 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 05 03:38:56 2023 +0000 |
| tree | d22f8cfc76d4a60f0d460da5d364834ef15c5380 | |
| parent | 7847525b3e40b8682a18b78edc8c1554129d6105 [diff] | |
| parent | ddd00cd23a9870fb1c0b21dfd3067db8e8557a93 [diff] |
Merge "Remove an NPE in tearDown" into main am: e7b7ceb70d am: ddd00cd23a Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2770460 Change-Id: If28ea035ec72fdf1b36be67c8df15a8c188f25a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java index 5f321bb..d92fb01 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
@@ -199,7 +199,8 @@ 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 {