From d1df8ac6d076ef15ba8857211da2e447b6505fb3 Mon Sep 17 00:00:00 2001
From: San Mehat <san@google.com>
Date: Tue, 26 Jan 2010 06:17:26 -0800
Subject: [PATCH] NetworkManagementService: Start service when SystemServer
 starts up

Signed-off-by: San Mehat <san@google.com>
---
 core/java/android/content/Context.java                | 11 +++++++++++
 .../com/android/server/NetworkManagementService.java  |  2 +-
 services/java/com/android/server/SystemServer.java    |  8 ++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index d76b6167b489a..321ba5c477a4c 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -1276,6 +1276,17 @@ public abstract class Context {
      */
     public static final String CONNECTIVITY_SERVICE = "connectivity";
 
+    /**
+     * Use with {@link #getSystemService} to retrieve a {@link
+     * android.net.NetworkManagementService} for handling management of
+     * system network services
+     *
+     * @hide
+     * @see #getSystemService
+     * @see android.net.NetworkManagementService
+     */
+    public static final String NETWORKMANAGEMENT_SERVICE = "network_management";
+
     /**
      * Use with {@link #getSystemService} to retrieve a {@link
      * android.net.wifi.WifiManager} for handling management of
diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java
index 8594e444438fb..b34b50aae63dd 100644
--- a/services/java/com/android/server/NetworkManagementService.java
+++ b/services/java/com/android/server/NetworkManagementService.java
@@ -78,7 +78,7 @@ class NetworkManagementService extends INetworkManagementService.Stub {
      *
      * @param context  Binder context for this service
      */
-    private NetworkManagementService(Context context) {
+    public NetworkManagementService(Context context) {
         mContext = context;
 
         mObservers = new ArrayList<INetworkManagementEventObserver>();
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 6b3f433733b61..22447ede8e6cd 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -248,6 +248,14 @@ class ServerThread extends Thread {
                 Log.e(TAG, "Failure starting NetStat Service", e);
             }
 
+            try {
+                Log.i(TAG, "NetworkManagement Service");
+                ServiceManager.addService(
+                        Context.NETWORKMANAGEMENT_SERVICE, new NetworkManagementService(context));
+            } catch (Throwable e) {
+                Log.e(TAG, "Failure starting NetworkManagement Service", e);
+            }
+
             try {
                 Log.i(TAG, "Connectivity Service");
                 connectivity = ConnectivityService.getInstance(context);