commit 5371dbf5ad8d3fcb8000f2295fb64393e64d44b2
author Robert Greenwalt <rgreenwalt@google.com> Fri Mar 22 12:00:17 2013 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Fri Mar 22 12:00:17 2013 -0700
tree 61011ee861e917f1bd1298adb36acd940f2964bc
parent 6383982582abac178f2e0fcb17c35304d23e6d09

Prevent NPE in new API.

bug:8455284
Change-Id: I26ecbd024d1fe001f3af792c4e66409b2968c7ec

core/java/android/net/LinkProperties.java

diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java
index e522754..eedc372 100644
--- a/core/java/android/net/LinkProperties.java
+++ b/core/java/android/net/LinkProperties.java
@@ -121,7 +121,7 @@
 
     public Collection<String> getAllInterfaceNames() {
         Collection interfaceNames = new ArrayList<String>(mStackedLinks.size() + 1);
-        interfaceNames.add(new String(mIfaceName));
+        if (mIfaceName != null) interfaceNames.add(new String(mIfaceName));
         for (LinkProperties stacked: mStackedLinks.values()) {
             interfaceNames.addAll(stacked.getAllInterfaceNames());
         }