joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Initialize serviceCache before first use" into main am: 1e2aa90e38

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

Change-Id: I7850edefd048d130840b730d821358e9f83bd75b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Remi NGUYEN VAN 2024-02-01 09:56:37 +00:00 • committed by Automerger Merge Worker
commit 3d41ca8aeb
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
service-t/src/com/android/server/connectivity/mdns/MdnsDiscoveryManager.java
View file

@ -55,7 +55,8 @@ public class MdnsDiscoveryManager implements MdnsSocketClientBase.Callback {
@NonNull private final DiscoveryExecutor discoveryExecutor;
@NonNull private final MdnsFeatureFlags mdnsFeatureFlags;
// Only accessed on the handler thread, set to non-null right after initializing the handler
// Only accessed on the handler thread, initialized before first use
@Nullable
private MdnsServiceCache serviceCache;
private static class PerSocketServiceTypeClients {
@ -129,11 +130,6 @@ public class MdnsDiscoveryManager implements MdnsSocketClientBase.Callback {
this.perSocketServiceTypeClients = new PerSocketServiceTypeClients();
this.mdnsFeatureFlags = mdnsFeatureFlags;
this.discoveryExecutor = new DiscoveryExecutor(socketClient.getLooper());
// The very first posted task is to initialize the service cache, so it will be always
// set in other tasks running on the handler
discoveryExecutor.execute(() ->
serviceCache = new MdnsServiceCache(Looper.myLooper(), mdnsFeatureFlags));
}
private static class DiscoveryExecutor implements Executor {
@ -358,9 +354,13 @@ public class MdnsDiscoveryManager implements MdnsSocketClientBase.Callback {
sharedLog.log("createServiceTypeClient for type:" + serviceType + " " + socketKey);
final String tag = serviceType + "-" + socketKey.getNetwork()
+ "/" + socketKey.getInterfaceIndex();
final Looper looper = Looper.myLooper();
if (serviceCache == null) {
serviceCache = new MdnsServiceCache(looper, mdnsFeatureFlags);
}
return new MdnsServiceTypeClient(
serviceType, socketClient,
executorProvider.newServiceTypeClientSchedulerExecutor(), socketKey,
sharedLog.forSubComponent(tag), Looper.myLooper(), serviceCache);
sharedLog.forSubComponent(tag), looper, serviceCache);
}
}