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

Merge "Stop the created handler threads" into main

Browse Source
This commit is contained in:
Chiachang Wang
2023-08-17 09:40:05 +00:00
committed by Gerrit Code Review
parent 23b0bab6b1 8d336eb1a3
commit 033ca4c8cf
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/unit/java/com/android/server/connectivity/AutomaticOnOffKeepaliveTrackerTest.java
View File

@@ -367,6 +367,10 @@ public class AutomaticOnOffKeepaliveTrackerTest {
@After @After
public void teardown() throws Exception { public void teardown() throws Exception {
TestKeepaliveInfo.closeAllSockets(); TestKeepaliveInfo.closeAllSockets();
if (mHandlerThread != null) {
mHandlerThread.quitSafely();
mHandlerThread.join();
}
} }
private final class AOOTestHandler extends Handler { private final class AOOTestHandler extends Handler {

9
tests/unit/java/com/android/server/connectivity/KeepaliveStatsTrackerTest.java
View File

@@ -67,6 +67,7 @@ import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRunner; import com.android.testutils.DevSdkIgnoreRunner;
import com.android.testutils.HandlerUtils; import com.android.testutils.HandlerUtils;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
@@ -240,6 +241,14 @@ public class KeepaliveStatsTrackerTest {
HandlerUtils.waitForIdle(mTestHandler, TIMEOUT_MS); HandlerUtils.waitForIdle(mTestHandler, TIMEOUT_MS);
} }
@After
public void tearDown() throws Exception {
if (mHandlerThread != null) {
mHandlerThread.quitSafely();
mHandlerThread.join();
}
}
private void setElapsedRealtime(long time) { private void setElapsedRealtime(long time) {
doReturn(time).when(mDependencies).getElapsedRealtime(); doReturn(time).when(mDependencies).getElapsedRealtime();
} }