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

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

Browse Source
This commit is contained in:
Joe Onorato
2010-09-01 21:23:37 -07:00
committed by Android (Google) Code Review
parent 949498de66 00092874b1
commit 2de8a82643
1 changed files with 6 additions and 5 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 volatile ConnectivityService sServiceInstance;
private static ConnectivityService sServiceInstance;
private Handler mHandler;
@@ -176,10 +176,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {
Looper.loop();
}
public static synchronized ConnectivityService getServiceInstance(Context context) {
if (sServiceInstance == null) {
ConnectivityThread thread = new ConnectivityThread(context);
thread.start();
public static ConnectivityService getServiceInstance(Context context) {
ConnectivityThread thread = new ConnectivityThread(context);
thread.start();
synchronized (thread) {
while (sServiceInstance == null) {
try {
// Wait until sServiceInstance has been initialized.