commit e7b7ceb70d816c0cb7c0ceaacb3fd05c303c29cb
author Jean Chalard <jchalard@google.com> Thu Oct 05 02:44:59 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 05 02:44:59 2023 +0000
tree 85b6e1f97fbc05d1a517e3f52e2e3361618080ba
parent f24beefe556a63cec68403d5bbca378e07407a0e
parent ec0149f1ba48f8539824ae8b8ee38343b54cabe0

Merge "Remove an NPE in tearDown" into main

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

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 89a55a7..b9ed56a 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
@@ -198,7 +198,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 {