Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Changed ConnectivityService#getServiceInstance so its a singleton."

Browse Source
This commit is contained in:
Wink Saville
2010-09-01 15:15:06 -07:00
committed by Android (Google) Code Review
parent 0eb9b77eec 28961cc02f
commit 276e8d44a4
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/java/com/android/server/ConnectivityService.java
View File

@@ -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) {
ConnectivityThread thread = new ConnectivityThread(context);
thread.start();
synchronized (thread) {
public static synchronized ConnectivityService getServiceInstance(Context context) {
if (sServiceInstance == null) {
ConnectivityThread thread = new ConnectivityThread(context);
thread.start();
while (sServiceInstance == null) {
try {
// Wait until sServiceInstance has been initialized.