Skip to content

Commit 3721928

Browse files
xylophone21pull[bot]
authored andcommitted
fix mdns leak on android (#15292)
* fix removeServices exception, we missed clear registrationListeners * fix restyled-io and ci errors * remove try catch * fix restyled-io and ci errors
1 parent b19f141 commit 3721928

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

src/platform/android/java/chip/platform/NsdManagerServiceResolver.java

+10-2
Original file line numberDiff line numberDiff line change
@@ -168,23 +168,31 @@ public void onUnregistrationFailed(NsdServiceInfo serviceInfo, int errorCode) {
168168

169169
@Override
170170
public void onServiceRegistered(NsdServiceInfo serviceInfo) {
171-
Log.i(TAG, "service " + serviceInfo.getServiceName() + " onServiceRegistered");
171+
Log.i(
172+
TAG,
173+
"service " + serviceInfo.getServiceName() + "(" + this + ") onServiceRegistered");
172174
}
173175

174176
@Override
175177
public void onServiceUnregistered(NsdServiceInfo serviceInfo) {
176-
Log.i(TAG, "service " + serviceInfo.getServiceName() + " onServiceRegistered");
178+
Log.i(
179+
TAG,
180+
"service " + serviceInfo.getServiceName() + "(" + this + ") onServiceUnregistered");
177181
}
178182
};
179183
registrationListeners.add(registrationListener);
180184

181185
nsdManager.registerService(serviceInfo, NsdManager.PROTOCOL_DNS_SD, registrationListener);
186+
Log.d(TAG, "publish " + registrationListener + " count = " + registrationListeners.size());
182187
}
183188

184189
@Override
185190
public void removeServices() {
191+
Log.d(TAG, "removeServices: ");
186192
for (NsdManager.RegistrationListener l : registrationListeners) {
193+
Log.i(TAG, "Remove " + l);
187194
nsdManager.unregisterService(l);
188195
}
196+
registrationListeners.clear();
189197
}
190198
}

0 commit comments

Comments
 (0)