commit 89b6392046865e5ceaead5238b6f366cd5e9d3c5
author Lorenzo Colitti <lorenzo@google.com> Thu Jul 30 23:41:43 2015 +0900
committer Lorenzo Colitti <lorenzo@google.com> Fri Oct 09 12:36:30 2015 +0900
tree 3d4aa0bc50d204f2144005795b90e80091566414
parent f8f9c10247b32c0075f0e0e30c1f38d7a61a030d

Add a null check to hasIPv4AddressOnInterface.

Change-Id: Ie38505ec0a93f4060348d92db341c536b7d60ed0

core/java/android/net/LinkProperties.java

diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java
index c4de4a2..6bfa2a4 100644
--- a/core/java/android/net/LinkProperties.java
+++ b/core/java/android/net/LinkProperties.java
@@ -667,7 +667,8 @@
      * @return {@code true} if there is an IPv4 address, {@code false} otherwise.
      */
     private boolean hasIPv4AddressOnInterface(String iface) {
-        return (mIfaceName.equals(iface) && hasIPv4Address()) ||
+        // mIfaceName can be null.
+        return (Objects.equals(iface, mIfaceName) && hasIPv4Address()) ||
                 (iface != null && mStackedLinks.containsKey(iface) &&
                         mStackedLinks.get(iface).hasIPv4Address());
     }