commit 777b96dcaddb4edc977fa6d515d7d4d9d2470d4f
author Paul Hu <paulhu@google.com> Mon Apr 01 19:24:38 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 01 19:24:38 2019 -0700
tree 3f36732f94d5af98003a89676e32b24c10190c8d
parent 7c4f7c5fe396405d4ea6fbdff3c5a3114eded875
parent 736189fc882769bc45872cab037a3f3a3e2e9089

Merge "Fix IpPrefixTest#testContainsInetAddress fail." am: 9c58ddc48e am: b9cffc513e
am: 736189fc88

Change-Id: I9e74dc9bf30a53ce78395e502a52891ba488f4b1

tests/net/java/android/net/IpPrefixTest.java

diff --git a/tests/net/java/android/net/IpPrefixTest.java b/tests/net/java/android/net/IpPrefixTest.java
index 3cc0e36..abf019a 100644
--- a/tests/net/java/android/net/IpPrefixTest.java
+++ b/tests/net/java/android/net/IpPrefixTest.java
@@ -231,7 +231,6 @@
         assertFalse(p.contains(Address("2001:db8:f00::ace:d00e")));
         assertFalse(p.contains(Address("2001:db8:f00::bad:d00d")));
         assertFalse(p.contains(Address("2001:4868:4860::8888")));
-        assertFalse(p.contains((InetAddress)null));
         assertFalse(p.contains(Address("8.8.8.8")));
 
         p = new IpPrefix("192.0.2.0/23");