summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorLuke Huang <huangluke@google.com>2019-05-28 15:51:55 +0800
committerLuke Huang <huangluke@google.com>2019-05-29 13:56:27 +0800
commit9f97f97d0d1d29210f502b9101ebd80efb5129e2 (patch)
tree70c374bb021a3199deca2a4bc20079d6f367e237 /core/java/android
parentd8b457545a7096f0e37befa920ec62bea5b6bb10 (diff)
Minor changes for DnsUtils and its test
fix nits for ag/7671031 Bug: 129530368 Test: atest DnsUtilsTest Change-Id: I562d33870a933a5fe55c89137a2d9574e3c59b90
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/net/util/DnsUtils.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/core/java/android/net/util/DnsUtils.java b/core/java/android/net/util/DnsUtils.java
index e6abd5059027..7908353eeda2 100644
--- a/core/java/android/net/util/DnsUtils.java
+++ b/core/java/android/net/util/DnsUtils.java
@@ -141,14 +141,17 @@ public class DnsUtils {
*/
public static @NonNull List<InetAddress> rfc6724Sort(@Nullable Network network,
@NonNull List<InetAddress> answers) {
- List<SortableAddress> sortableAnswerList = new ArrayList<>();
- answers.forEach(addr -> sortableAnswerList.add(
- new SortableAddress(addr, findSrcAddress(network, addr))));
+ final ArrayList<SortableAddress> sortableAnswerList = new ArrayList<>();
+ for (InetAddress addr : answers) {
+ sortableAnswerList.add(new SortableAddress(addr, findSrcAddress(network, addr)));
+ }
Collections.sort(sortableAnswerList, sRfc6724Comparator);
final List<InetAddress> sortedAnswers = new ArrayList<>();
- sortableAnswerList.forEach(ans -> sortedAnswers.add(ans.address));
+ for (SortableAddress ans : sortableAnswerList) {
+ sortedAnswers.add(ans.address);
+ }
return sortedAnswers;
}