commit 17ffba97001adae9366c2c6e2817ac68e90f7929
author Jeff Sharkey <jsharkey@android.com> Fri Nov 30 17:49:39 2012 -0800
committer Jeff Sharkey <jsharkey@android.com> Fri Nov 30 17:49:39 2012 -0800
tree 06ec69fb8cf73366b15dd433a71e40be45e042fc
parent 526438dbe665b85f8da49beb70b9366f09b9b477

Avoid null mobile interfaces.

Bug: 7634215
Change-Id: I6745f6a78c07ba11d98b4562a6b53386112ef652

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);
                     }