diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-03-22 12:00:17 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2013-03-22 12:00:17 -0700 |
| commit | 55187f18505aad67f824094061af1b6d0a0ebb38 (patch) | |
| tree | 30a604392c04929c388e0dd89e833293cd643640 /core/java/android/net | |
| parent | b7f4c7b7feec98adde79d6d691c0001943b16595 (diff) | |
| download | frameworks_base-55187f18505aad67f824094061af1b6d0a0ebb38.zip frameworks_base-55187f18505aad67f824094061af1b6d0a0ebb38.tar.gz frameworks_base-55187f18505aad67f824094061af1b6d0a0ebb38.tar.bz2 | |
Prevent NPE in new API.
bug:8455284
Change-Id: I26ecbd024d1fe001f3af792c4e66409b2968c7ec
Diffstat (limited to 'core/java/android/net')
| -rw-r--r-- | core/java/android/net/LinkProperties.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 class LinkProperties implements Parcelable { 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()); } |