Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4c597e2 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 8735745b: am 55187f18: Prevent NPE in new API. 

* commit '8735745b':
  Prevent NPE in new API.
parents cef41bbd 8735745b

core/java/android/net/LinkProperties.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ public class LinkProperties implements Parcelable { 




    public Collection<String> getAllInterfaceNames() {

    public Collection<String> getAllInterfaceNames() {

        Collection interfaceNames = new ArrayList<String>(mStackedLinks.size() + 1);

        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()) {

        for (LinkProperties stacked: mStackedLinks.values()) {

            interfaceNames.addAll(stacked.getAllInterfaceNames());

            interfaceNames.addAll(stacked.getAllInterfaceNames());

        }

        }