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 "NsdManager dumpsys explicitly marks offload client" into main

Browse source
This commit is contained in:
Yuyang Huang 2025-06-24 22:47:49 -07:00 • committed by Android (Google) Code Review
commit 63d1babeeb
1 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
service-t/src/com/android/server/NsdService.java
View file

@ -270,13 +270,16 @@ public class NsdService extends INsdManager.Stub {
final long mOffloadCapabilities;
final long mOffloadType;
@NonNull final IOffloadEngine mOffloadEngine;
final NsdServiceConnector mConnector;
OffloadEngineInfo(@NonNull IOffloadEngine offloadEngine,
@NonNull String interfaceName, long capabilities, long offloadType) {
@NonNull String interfaceName, long capabilities, long offloadType,
NsdServiceConnector connector) {
this.mOffloadEngine = offloadEngine;
this.mInterfaceName = interfaceName;
this.mOffloadCapabilities = capabilities;
this.mOffloadType = offloadType;
this.mConnector = connector;
}
}
@ -1344,6 +1347,12 @@ public class NsdService extends INsdManager.Stub {
break;
case NsdManager.REGISTER_OFFLOAD_ENGINE:
offloadEngineInfo = (OffloadEngineInfo) msg.obj;
clientInfo = mClients.get(offloadEngineInfo.mConnector);
if (clientInfo == null) {
Log.e(TAG, "Unknown connector in calls to register offload engine");
break;
}
clientInfo.markIsOffloadEngine();
// TODO: Limits the number of registrations created by a given class.
mOffloadEngines.register(offloadEngineInfo.mOffloadEngine,
offloadEngineInfo);
@ -2461,7 +2470,7 @@ public class NsdService extends INsdManager.Stub {
mNsdStateMachine.sendMessage(
mNsdStateMachine.obtainMessage(NsdManager.REGISTER_OFFLOAD_ENGINE,
new OffloadEngineInfo(cb, ifaceName, offloadCapabilities,
offloadTypes)));
offloadTypes, this)));
}
@Override
@ -2886,6 +2895,7 @@ public class NsdService extends INsdManager.Stub {
private final SharedLog mClientLogs;
// Report the nsd metrics data
private final NetworkNsdReportedMetrics mMetrics;
private boolean mIsOffloadEngine = false;
private ClientInfo(INsdManagerCallback cb, int uid, boolean useJavaBackend,
SharedLog sharedLog, NetworkNsdReportedMetrics metrics) {
@ -2904,6 +2914,9 @@ public class NsdService extends INsdManager.Stub {
sb.append("mResolvedService ").append(mResolvedService).append(", ");
sb.append("mIsLegacy ").append(mIsPreSClient).append(", ");
sb.append("mUseJavaBackend ").append(mUseJavaBackend).append(", ");
if (mIsOffloadEngine) {
sb.append("isOffloadEngine").append(", ");
}
sb.append("mClientRequests:\n");
for (int i = 0; i < mClientRequests.size(); i++) {
int clientRequestId = mClientRequests.keyAt(i);
@ -2926,6 +2939,10 @@ public class NsdService extends INsdManager.Stub {
mIsPreSClient = true;
}
private void markIsOffloadEngine() {
mIsOffloadEngine = true;
}
private MdnsListener unregisterMdnsListenerFromRequest(ClientRequest request) {
final MdnsListener listener =
((DiscoveryManagerRequest) request).mListener;