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

Catch UnsupportedOperationException on calling mdns

Browse source 
MDNS native support from Netd is stopped in V.

Bug: 298594687
Bug: 312092770
Test: run CtsNetTestCasesMaxTargetSdk30 on V, no fatal exception.
Change-Id: I3774288cdf5b82e6aeeee7ee2d030fdc524e1aa8
This commit is contained in:
Ken Chen 2023-11-20 16:10:08 +08:00
commit a49e8e0b7b
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
framework-t/src/android/net/nsd/MDnsManager.java
View file

@ -51,7 +51,7 @@ public class MDnsManager {
public void startDaemon() {
try {
mMdns.startDaemon();
} catch (RemoteException | ServiceSpecificException e) {
} catch (RemoteException | ServiceSpecificException | UnsupportedOperationException e) {
Log.e(TAG, "Start mdns failed.", e);
}
}
@ -62,7 +62,7 @@ public class MDnsManager {
public void stopDaemon() {
try {
mMdns.stopDaemon();
} catch (RemoteException | ServiceSpecificException e) {
} catch (RemoteException | ServiceSpecificException | UnsupportedOperationException e) {
Log.e(TAG, "Stop mdns failed.", e);
}
}
@ -85,7 +85,7 @@ public class MDnsManager {
registrationType, port, txtRecord, interfaceIdx);
try {
mMdns.registerService(info);
} catch (RemoteException | ServiceSpecificException e) {
} catch (RemoteException | ServiceSpecificException | UnsupportedOperationException e) {
Log.e(TAG, "Register service failed.", e);
return false;
}
@ -105,7 +105,7 @@ public class MDnsManager {
registrationType, "" /* domainName */, interfaceIdx, NETID_UNSET);
try {
mMdns.discover(info);
} catch (RemoteException | ServiceSpecificException e) {
} catch (RemoteException | ServiceSpecificException | UnsupportedOperationException e) {
Log.e(TAG, "Discover service failed.", e);
return false;
}
@ -129,7 +129,7 @@ public class MDnsManager {
new byte[0] /* txtRecord */, interfaceIdx);
try {
mMdns.resolve(info);
} catch (RemoteException | ServiceSpecificException e) {
} catch (RemoteException | ServiceSpecificException | UnsupportedOperationException e) {
Log.e(TAG, "Resolve service failed.", e);
return false;
}
@ -149,7 +149,7 @@ public class MDnsManager {
"" /* address */, interfaceIdx, NETID_UNSET);
try {
mMdns.getServiceAddress(info);
} catch (RemoteException | ServiceSpecificException e) {
} catch (RemoteException | ServiceSpecificException | UnsupportedOperationException e) {
Log.e(TAG, "Get service address failed.", e);
return false;
}
@ -165,7 +165,7 @@ public class MDnsManager {
public boolean stopOperation(int id) {
try {
mMdns.stopOperation(id);
} catch (RemoteException | ServiceSpecificException e) {
} catch (RemoteException | ServiceSpecificException | UnsupportedOperationException e) {
Log.e(TAG, "Stop operation failed.", e);
return false;
}
@ -180,7 +180,7 @@ public class MDnsManager {
public void registerEventListener(@NonNull IMDnsEventListener listener) {
try {
mMdns.registerEventListener(listener);
} catch (RemoteException | ServiceSpecificException e) {
} catch (RemoteException | ServiceSpecificException | UnsupportedOperationException e) {
Log.e(TAG, "Register listener failed.", e);
}
}
@ -193,7 +193,7 @@ public class MDnsManager {
public void unregisterEventListener(@NonNull IMDnsEventListener listener) {
try {
mMdns.unregisterEventListener(listener);
} catch (RemoteException | ServiceSpecificException e) {
} catch (RemoteException | ServiceSpecificException | UnsupportedOperationException e) {
Log.e(TAG, "Unregister listener failed.", e);
}
}