Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03b58bdf authored Jan 26, 2010 by San Mehat Committed by Android (Google) Code Review Jan 26, 2010

Merge "NetworkManagementService: Start service when SystemServer starts up"

parents 8d9eb9f6 d1df8ac6

core/java/android/content/Context.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -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

services/java/com/android/server/NetworkManagementService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>();

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -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);