Merge "Avoid null mobile interfaces." into jb-mr1.1-dev

2012-12-03 11:32:51 -08:00
parent 4fd38e8d13 6a328afbab
commit ed3fba6538
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/net/NetworkStatsService.java
+++ b/services/java/com/android/server/net/NetworkStatsService.java
@@ -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);
                    }