Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev

Browse Source
This commit is contained in:
John Huang
2013-11-13 19:13:59 +00:00
committed by Android (Google) Code Review
parent 41b92b008e 4038724a53
commit 54ca906604
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -483,10 +483,14 @@ public class NsdService extends INsdManager.Stub {
clientInfo.mResolvedService.setPort(Integer.parseInt(cooked[4]));
stopResolveService(id);
if (!getAddrInfo(id, cooked[3])) {
removeRequestMap(clientId, id, clientInfo);
int id2 = getUniqueId();
if (getAddrInfo(id2, cooked[3])) {
storeRequestMap(clientId, id2, clientInfo);
} else {
clientInfo.mChannel.sendMessage(NsdManager.RESOLVE_SERVICE_FAILED,
NsdManager.FAILURE_INTERNAL_ERROR, clientId);
removeRequestMap(clientId, id, clientInfo);
clientInfo.mResolvedService = null;
}
break;