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

Handle closed socket and NPE properly am: 8f4adaedaf am: 4596ba4bd1

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

Change-Id: I86967659e81066855330f3e0a9013d6f23db2d10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yuyang Huang 2023-09-11 07:44:52 +00:00 • committed by Automerger Merge Worker
commit c8381f71b2
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
service-t/src/com/android/server/connectivity/mdns/MdnsSocket.java
View file

@ -128,9 +128,13 @@ public class MdnsSocket {
* cannot be determined, returns -1.
*/
public int getInterfaceIndex() {
if (multicastSocket.isClosed()) {
sharedLog.e("Socket is closed");
return -1;
}
try {
return multicastSocket.getNetworkInterface().getIndex();
} catch (SocketException e) {
} catch (SocketException | NullPointerException e) {
sharedLog.e("Failed to retrieve interface index for socket.", e);
return -1;
}