commit ed3fba653864101d3dd335941f082104aad8f532
author Jeff Sharkey <jsharkey@android.com> Mon Dec 03 11:32:51 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 03 11:32:51 2012 -0800
tree f12fc8ab84c1561348ccf5a3c823def8ed40302a
parent 4fd38e8d13697cd1b169487719982f32cc5fb425
parent 6a328afbab37981f34d8578972dbb2bf1abb7c41

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

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

diff --git a/services/java/com/android/server/net/NetworkStatsService.java b/services/java/com/android/server/net/NetworkStatsService.java
index 7101520..546f2be 100644
--- a/services/java/com/android/server/net/NetworkStatsService.java
+++ b/services/java/com/android/server/net/NetworkStatsService.java
@@ -903,7 +903,7 @@
                 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);
                     }