summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robert Greenwalt <robdroid@android.com> 2010-07-15 16:01:25 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-07-15 16:01:25 -0700
commit0761cea3bfec86d5fe08b3fa7f4484266f36024c (patch)
treed26aee507b52cde74c11edb1fec34e851e43987b
parent28a8467e51d052e1b3c52ba414633601e47e7530 (diff)
parent0a0ba099ed89270a9346748ccfe2265def595e9e (diff)
Merge "Fix Emulator boot."
-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 e74db6702366..f067392a1561 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