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

Fix the memory leak in nsd tests

Browse Source 
The NsdManager constructor creates a new thread, which is not
intended to be closed. However, the test in NsdMangerTest and
NsdServiceTest create a new NsdManager instance, resulting in a
large number of threads running during the tests. This can lead
to an out-of-memory error for the tests. To resolve this issue,
use the common singleton thread ConnectivityThread to handle
tasks from the various instances.

Fix: 308544734
Test: atest ConnectivityCoverageTests --test-filter Nsd*
Change-Id: I1908a2bb1bd20da8e0498353bca26f7e89e16626
This commit is contained in:
Paul Hu
2023-11-16 10:20:47 +08:00
parent 7e3344889e
commit 27662f0cc3
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
framework-t/src/android/net/nsd/NsdManager.java
View File

@@ -34,10 +34,10 @@ import android.app.compat.CompatChanges;
import android.content.Context; import android.content.Context;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.ConnectivityManager.NetworkCallback; import android.net.ConnectivityManager.NetworkCallback;
import android.net.ConnectivityThread;
import android.net.Network; import android.net.Network;
import android.net.NetworkRequest; import android.net.NetworkRequest;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper; import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.RemoteException; import android.os.RemoteException;
@@ -632,10 +632,9 @@ public final class NsdManager {
*/ */
public NsdManager(Context context, INsdManager service) { public NsdManager(Context context, INsdManager service) {
mContext = context; mContext = context;
// Use a common singleton thread ConnectivityThread to be shared among all nsd tasks.
HandlerThread t = new HandlerThread("NsdManager"); // Instead of launching separate threads to handle tasks from the various instances.
t.start(); mHandler = new ServiceHandler(ConnectivityThread.getInstanceLooper());
mHandler = new ServiceHandler(t.getLooper());
try { try {
mService = service.connect(new NsdCallbackImpl(mHandler), CompatChanges.isChangeEnabled( mService = service.connect(new NsdCallbackImpl(mHandler), CompatChanges.isChangeEnabled(

1
tests/unit/java/android/net/nsd/NsdManagerTest.java
View File

@@ -51,6 +51,7 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
@DevSdkIgnoreRunner.MonitorThreadLeak
@RunWith(DevSdkIgnoreRunner.class) @RunWith(DevSdkIgnoreRunner.class)
@SmallTest @SmallTest
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2)

1
tests/unit/java/com/android/server/NsdServiceTest.java
View File

@@ -145,6 +145,7 @@ import java.util.Queue;
// TODOs: // TODOs:
// - test client can send requests and receive replies // - test client can send requests and receive replies
// - test NSD_ON ENABLE/DISABLED listening // - test NSD_ON ENABLE/DISABLED listening
@DevSdkIgnoreRunner.MonitorThreadLeak
@RunWith(DevSdkIgnoreRunner.class) @RunWith(DevSdkIgnoreRunner.class)
@SmallTest @SmallTest
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2)