joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix the memory leak in nsd tests" into main am: 005fb887e6

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2814218

Change-Id: I444dfbd7828ab2815f6012c703bf5c8b1f205a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Paul Hu 2023-11-22 03:03:00 +00:00 • committed by Automerger Merge Worker
commit 23e7336673
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.net.ConnectivityManager;
import android.net.ConnectivityManager.NetworkCallback;
import android.net.ConnectivityThread;
import android.net.Network;
import android.net.NetworkRequest;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
import android.os.Message;
import android.os.RemoteException;
@ -632,10 +632,9 @@ public final class NsdManager {
*/
public NsdManager(Context context, INsdManager service) {
mContext = context;
HandlerThread t = new HandlerThread("NsdManager");
t.start();
mHandler = new ServiceHandler(t.getLooper());
// Use a common singleton thread ConnectivityThread to be shared among all nsd tasks.
// Instead of launching separate threads to handle tasks from the various instances.
mHandler = new ServiceHandler(ConnectivityThread.getInstanceLooper());
try {
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.MockitoAnnotations;
@DevSdkIgnoreRunner.MonitorThreadLeak
@RunWith(DevSdkIgnoreRunner.class)
@SmallTest
@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:
// - test client can send requests and receive replies
// - test NSD_ON ENABLE/DISABLED listening
@DevSdkIgnoreRunner.MonitorThreadLeak
@RunWith(DevSdkIgnoreRunner.class)
@SmallTest
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2)