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

Automated import from //branches/master/...@142414,142414

Browse Source
This commit is contained in:
Fred Quintana
2009-03-24 22:48:12 -07:00
committed by The Android Open Source Project
parent d86c782127
commit 603073430b
28 changed files with 4979 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/java/com/android/server/SystemServer.java
View File

@@ -32,12 +32,7 @@ import android.content.pm.IPackageManager;
import android.database.ContentObserver;
import android.database.Cursor;
import android.media.AudioService;
import android.os.IBinder;
import android.os.Looper;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemClock;
import android.os.SystemProperties;
import android.os.*;
import android.provider.Contacts.People;
import android.provider.Settings;
import android.server.BluetoothA2dpService;
@@ -45,6 +40,7 @@ import android.server.BluetoothDeviceService;
import android.server.search.SearchManagerService;
import android.util.EventLog;
import android.util.Log;
import android.accounts.AccountManagerService;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
@@ -117,6 +113,14 @@ class ServerThread extends Thread {
mContentResolver = context.getContentResolver();
try {
Log.i(TAG, "Starting Account Manager.");
ServiceManager.addService(Context.ACCOUNT_SERVICE,
new AccountManagerService(context));
} catch (Throwable e) {
Log.e(TAG, "Failure starting Account Manager", e);
}
Log.i(TAG, "Starting Content Manager.");
ContentService.main(context,
factoryTest == SystemServer.FACTORY_TEST_LOW_LEVEL);