From 62dbb22bd4878369975492c8a1c234840e418a4f Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Thu, 18 Feb 2010 10:56:30 -0800
Subject: [PATCH] Make the simulator boot again.

---
 .../java/com/android/server/NetworkManagementService.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java
index b9bb16f15e6a5..1015028fc5668 100644
--- a/services/java/com/android/server/NetworkManagementService.java
+++ b/services/java/com/android/server/NetworkManagementService.java
@@ -28,6 +28,7 @@ import android.net.InterfaceConfiguration;
 import android.net.INetworkManagementEventObserver;
 import android.os.INetworkManagementService;
 import android.os.Handler;
+import android.os.SystemProperties;
 import android.text.TextUtils;
 import android.util.Log;
 import java.util.ArrayList;
@@ -87,6 +88,10 @@ class NetworkManagementService extends INetworkManagementService.Stub {
 
         mObservers = new ArrayList<INetworkManagementEventObserver>();
 
+        if ("simulator".equals(SystemProperties.get("ro.product.device"))) {
+            return;
+        }
+
         mConnector = new NativeDaemonConnector(
                 new NetdCallbackReceiver(), "netd", 10, "NetdConnector");
         Thread thread = new Thread(mConnector, NativeDaemonConnector.class.getName());