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

Commit 341ea53b authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am ae6428d7: am 1f8f2839: am ed3fba65: Merge "Avoid null mobile interfaces." into jb-mr1.1-dev 

* commit 'ae6428d7':
  Avoid null mobile interfaces.
parents 9badf238 ae6428d7

services/java/com/android/server/net/NetworkStatsService.java

+1 −1
Original line number Diff line number Diff line
@@ -903,7 +903,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
                ident.add(NetworkIdentity.buildNetworkIdentity(mContext, state));



                // remember any ifaces associated with mobile networks

                if (isNetworkTypeMobile(state.networkInfo.getType())) {

                if (isNetworkTypeMobile(state.networkInfo.getType()) && iface != null) {

                    if (!contains(mMobileIfaces, iface)) {

                        mMobileIfaces = appendElement(String.class, mMobileIfaces, iface);

                    }