commit e5c3afb29241fd3faae309f973645d7f6a7ed111
author Robert Greenwalt <rgreenwalt@google.com> Wed Sep 22 14:32:35 2010 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Wed Sep 22 16:43:23 2010 -0700
tree 8ab1130fe1363493df7df19d938c71a12b9ecd82
parent b2044da3f9f9ad74f0dffd5ae024e558f8a9a89a

Cleanup Netd to prevent getting hung.

If the sending of the command fails we should note it and not wait forever
for the response.

We should also not say we're ready until we actually are.

bug:2993205
Change-Id: I380f0312ac4693ad184a526b330fdfa23f6ac558

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 859de46..9475005 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -254,7 +254,8 @@
             try {
                 Slog.i(TAG, "NetworkManagement Service");
                 ServiceManager.addService(
-                        Context.NETWORKMANAGEMENT_SERVICE, new NetworkManagementService(context));
+                        Context.NETWORKMANAGEMENT_SERVICE,
+                        NetworkManagementService.create(context));
             } catch (Throwable e) {
                 Slog.e(TAG, "Failure starting NetworkManagement Service", e);
             }