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

Handle closed socket and NPE properly

Browse source 
Don't get interfaceIndex if the socket is closed. Properly catch NPE
instead of letting is propagating.

Test: TH
Change-Id: If962541e67dd6323426e46bc7a1f118786f83b9b
This commit is contained in:
Yuyang Huang 2023-09-11 13:07:53 +09:00
commit 8f4adaedaf
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
service-t/src/com/android/server/connectivity/mdns/MdnsSocket.java
View file

@ -128,9 +128,13 @@ public class MdnsSocket {
* cannot be determined, returns -1.
*/
public int getInterfaceIndex() {
if (multicastSocket.isClosed()) {
sharedLog.e("Socket is closed");
return -1;
}
try {
return multicastSocket.getNetworkInterface().getIndex();
} catch (SocketException e) {
} catch (SocketException | NullPointerException e) {
sharedLog.e("Failed to retrieve interface index for socket.", e);
return -1;
}