Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88e29bf0 authored by Chiachang Wang's avatar Chiachang Wang Committed by android-build-merger
Browse files

Merge "Use UnknownHostException directly without casting it" am: 692abb71 

am: f20c7f3c

Change-Id: Ia9350b374b5a4b822898f44c9b322a524f9b0cda
parents 3a59eab5 f20c7f3c

src/com/android/networkstack/util/DnsUtils.java

+6 −7
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public class DnsUtils { 


        if (result.size() == 0) {

            logger.log("FAIL: " + errorMsg.toString());

            throw new UnknownHostException(errorMsg.toString());

            throw new UnknownHostException(host);

        }

        logger.log("OK: " + host + " " + result.toString());

        return result.toArray(new InetAddress[0]);
@@ -134,20 +134,19 @@ public class DnsUtils { 


        TrafficStats.setThreadStatsTag(oldTag);



        String errorMsg = null;

        List<InetAddress> result = null;

        Exception exception = null;

        try {

            result = resultRef.get(timeoutMs, TimeUnit.MILLISECONDS);

        } catch (ExecutionException e) {

            exception = e;

            errorMsg = e.getMessage();

        } catch (TimeoutException | InterruptedException e) {

            exception = new UnknownHostException("Timeout");

            errorMsg = "Timeout";

        } finally {

            logDnsResult(result, watch.stop() /* latency */, logger, type,

                    exception != null ? exception.getMessage() : "" /* errorMsg */);

            logDnsResult(result, watch.stop() /* latency */, logger, type, errorMsg);

        }



        if (null != exception) throw (UnknownHostException) exception;

        if (null != errorMsg) throw new UnknownHostException(host);



        return result.toArray(new InetAddress[0]);

    }