From 509c0615fed52e5ce0fc27304a72848d3a75f94a Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Tue, 24 Jul 2018 09:13:58 +0900 Subject: [PATCH] IpClient: fix in InitialConfiguration validation. This patch correctly invalidates InitialConfiguration objects with more than one IPv4 address specified. Bug: 111639419 Test: none Change-Id: Ifda174636544311bee456f17946779bac7d4a49e --- services/net/java/android/net/ip/IpClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/net/java/android/net/ip/IpClient.java b/services/net/java/android/net/ip/IpClient.java index 7f821ffd369a0..b77da28401d67 100644 --- a/services/net/java/android/net/ip/IpClient.java +++ b/services/net/java/android/net/ip/IpClient.java @@ -524,7 +524,7 @@ public class IpClient extends StateMachine { return false; } // There no more than one IPv4 address - if (ipAddresses.stream().filter(Inet4Address.class::isInstance).count() > 1) { + if (ipAddresses.stream().filter(LinkAddress::isIPv4).count() > 1) { return false; }