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 "Minor changes for DnsUtils and its test" am: 8c4ef95cbb

Browse source 
am: dfda15715d

Change-Id: Ic1990922e599884582606d1a4d7da3950200d25c
This commit is contained in:
Luke Huang 2019-05-29 03:33:34 -07:00 • committed by android-build-merger
commit f5d9463553
1 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/java/android/net/util/DnsUtils.java
View file

@ -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;
}