commit 4596ba4bd167ad617132d07cf9720fd9dd792167
author Yuyang Huang <yuyanghuang@google.com> Mon Sep 11 06:51:52 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 11 06:51:52 2023 +0000
tree c4d3a68fde1a3bbe5734cf63c00e42767d9c791b
parent 63b9d4a04c5f0a3041a6efb9e547df6e02dcd71b
parent 8f4adaedafd3383de866cbd136d2d7b724c0c615

Handle closed socket and NPE properly am: 8f4adaedaf

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

Change-Id: Ie1b5efb699c37314394f85ca04696f748343361f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/service-t/src/com/android/server/connectivity/mdns/MdnsSocket.java b/service-t/src/com/android/server/connectivity/mdns/MdnsSocket.java
index d690032..c51811b 100644
--- a/service-t/src/com/android/server/connectivity/mdns/MdnsSocket.java
+++ b/service-t/src/com/android/server/connectivity/mdns/MdnsSocket.java
@@ -128,9 +128,13 @@
      * 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;
         }