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

Merge "Network Service Discovery test: properly release resources" am: c9d24d203d am: 3a2e98b3ce

Browse Source 
am: f467db29f9

Change-Id: Id9be284a16112f999d752751a7972fd735573cda
This commit is contained in:
Hugo Benichi
2017-09-04 12:42:56 +00:00
committed by android-build-merger
parent 4aa35f8d1b 3a2e98b3ce
commit 619ce0a8f4
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/net/nsd/NsdManager.java
View File

@@ -21,25 +21,24 @@ import static com.android.internal.util.Preconditions.checkNotNull;
import static com.android.internal.util.Preconditions.checkStringNotEmpty; import static com.android.internal.util.Preconditions.checkStringNotEmpty;
import android.annotation.SdkConstant; import android.annotation.SdkConstant;
import android.annotation.SystemService;
import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SdkConstant.SdkConstantType;
import android.annotation.SystemService;
import android.content.Context; import android.content.Context;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread; 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.Messenger; import android.os.Messenger;
import android.text.TextUtils; import android.os.RemoteException;
import android.util.Log; import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
import java.util.concurrent.CountDownLatch;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.AsyncChannel; import com.android.internal.util.AsyncChannel;
import com.android.internal.util.Protocol; import com.android.internal.util.Protocol;
import java.util.concurrent.CountDownLatch;
/** /**
* The Network Service Discovery Manager class provides the API to discover services * The Network Service Discovery Manager class provides the API to discover services
* on a network. As an example, if device A and device B are connected over a Wi-Fi * on a network. As an example, if device A and device B are connected over a Wi-Fi
@@ -244,7 +243,7 @@ public final class NsdManager {
return name; return name;
} }
private static int FIRST_LISTENER_KEY = 1; private static final int FIRST_LISTENER_KEY = 1;
private final INsdManager mService; private final INsdManager mService;
private final Context mContext; private final Context mContext;
@@ -278,6 +277,7 @@ public final class NsdManager {
@VisibleForTesting @VisibleForTesting
public void disconnect() { public void disconnect() {
mAsyncChannel.disconnect(); mAsyncChannel.disconnect();
mHandler.getLooper().quitSafely();
} }
/** /**
@@ -650,7 +650,7 @@ public final class NsdManager {
private static void checkServiceInfo(NsdServiceInfo serviceInfo) { private static void checkServiceInfo(NsdServiceInfo serviceInfo) {
checkNotNull(serviceInfo, "NsdServiceInfo cannot be null"); checkNotNull(serviceInfo, "NsdServiceInfo cannot be null");
checkStringNotEmpty(serviceInfo.getServiceName(),"Service name cannot be empty"); checkStringNotEmpty(serviceInfo.getServiceName(), "Service name cannot be empty");
checkStringNotEmpty(serviceInfo.getServiceType(), "Service type cannot be empty"); checkStringNotEmpty(serviceInfo.getServiceType(), "Service type cannot be empty");
} }
} }