commit 8f5e3d13e166e4873e130a5ef7c987333dbac917
author Wink Saville <wink@google.com> Mon Jul 01 16:53:31 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 01 16:53:31 2013 +0000
tree bd453c23d640db2ad83413bb06d5a1b46aeaa5e0
parent 54d499f6db7b7fa42543cae98b001f790c8df70b
parent 8ed09e893f6a4b6a4f6503186515b8f6978baa14

Merge "Fix an NPE in NsdManager"

services/java/com/android/server/NsdService.java

diff --git a/services/java/com/android/server/NsdService.java b/services/java/com/android/server/NsdService.java
index faa72a2..e0f415b 100644
--- a/services/java/com/android/server/NsdService.java
+++ b/services/java/com/android/server/NsdService.java
@@ -417,7 +417,15 @@
                 int keyId = clientInfo.mClientIds.indexOfValue(id);
                 if (keyId != -1) {
                     clientId = clientInfo.mClientIds.keyAt(keyId);
+                } else {
+                    // This can happen because of race conditions. For example,
+                    // SERVICE_FOUND may race with STOP_SERVICE_DISCOVERY,
+                    // and we may get in this situation.
+                    Slog.d(TAG, "Notification for a listener that is no longer active: " + id);
+                    handled = false;
+                    return handled;
                 }
+
                 switch (code) {
                     case NativeResponseCode.SERVICE_FOUND:
                         /* NNN uniqueId serviceName regType domain */