Merge "Changed ConnectivityService#getServiceInstance so its a singleton." (276e8d44) · Commits · e / os / android_frameworks_base

services/java/com/android/server/ConnectivityService.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		private int mNumDnsEntries;

		private boolean mTestMode;
		private static ConnectivityService sServiceInstance;
		private static volatile ConnectivityService sServiceInstance;

		private Handler mHandler;

		@@ -174,11 +174,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		Looper.loop();
		}

		public static ConnectivityService getServiceInstance(Context context) {
		public static synchronized ConnectivityService getServiceInstance(Context context) {
		if (sServiceInstance == null) {
		ConnectivityThread thread = new ConnectivityThread(context);
		thread.start();

		synchronized (thread) {
		while (sServiceInstance == null) {
		try {
		// Wait until sServiceInstance has been initialized.