| commit | ddd00cd23a9870fb1c0b21dfd3067db8e8557a93 | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Thu Oct 05 03:07:15 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 05 03:07:15 2023 +0000 |
| tree | 162c47d2fe9ab5e9065095a260fb69dafe99ba29 | |
| parent | a98078095b52c0dcc89a4622d38755c675c84a6d [diff] | |
| parent | e7b7ceb70d816c0cb7c0ceaacb3fd05c303c29cb [diff] |
Merge "Remove an NPE in tearDown" into main am: e7b7ceb70d 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>
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 {