summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorRobert Greenwalt <robdroid@android.com>2010-07-15 15:51:48 -0700
committerRobert Greenwalt <robdroid@android.com>2010-07-15 15:51:48 -0700
commit0a0ba099ed89270a9346748ccfe2265def595e9e (patch)
treebe3cecbd1f75da28991b9f55666b3b2dec95a209 /core/java
parent506821b406181ff9b9a10c2fc078d16b79a8cf92 (diff)
downloadframeworks_base-0a0ba099ed89270a9346748ccfe2265def595e9e.zip
frameworks_base-0a0ba099ed89270a9346748ccfe2265def595e9e.tar.gz
frameworks_base-0a0ba099ed89270a9346748ccfe2265def595e9e.tar.bz2
Fix Emulator boot.
Catch a NPE that doesn't seem to happen on devices. Change-Id: I47d599afbed76798d8d312a59e30b89664363e93
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/net/MobileDataStateTracker.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java
index e74db67..f067392 100644
--- a/core/java/android/net/MobileDataStateTracker.java
+++ b/core/java/android/net/MobileDataStateTracker.java
@@ -205,8 +205,8 @@ public class MobileDataStateTracker implements NetworkStateTracker {
setDetailedState(DetailedState.DISCONNECTED, reason, apnName);
if (mNetworkProperties != null) {
- NetworkUtils.resetConnections(mNetworkProperties.getInterface().
- getName());
+ String iface = mNetworkProperties.getInterfaceName();
+ if (iface != null) NetworkUtils.resetConnections(iface);
}
// TODO - check this
// can't do this here - ConnectivityService needs it to clear stuff