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

Merge "Fix an NPE in NsdManager"

Browse Source
This commit is contained in:
Wink Saville
2013-07-01 16:53:31 +00:00
committed by Android (Google) Code Review
parent 68a7eb9f3b 930a8513db
commit 7861a9e15c
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/NsdService.java
View File

@@ -417,7 +417,15 @@ public class NsdService extends INsdManager.Stub {
int keyId = clientInfo.mClientIds.indexOfValue(id); int keyId = clientInfo.mClientIds.indexOfValue(id);
if (keyId != -1) { if (keyId != -1) {
clientId = clientInfo.mClientIds.keyAt(keyId); 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) { switch (code) {
case NativeResponseCode.SERVICE_FOUND: case NativeResponseCode.SERVICE_FOUND:
/* NNN uniqueId serviceName regType domain */ /* NNN uniqueId serviceName regType domain */