drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Create TextServiceManager and SpellCheckerService"

Browse Source 
This reverts commit eaddb89486.
This commit is contained in:
satok
2011-06-22 16:41:58 +09:00
parent f86ee14f6a
commit 8969d9924c
15 changed files with 3 additions and 988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,7 +228,6 @@ class ServerThread extends Thread {
WallpaperManagerService wallpaper = null;
LocationManagerService location = null;
CountryDetectorService countryDetector = null;
TextServiceManagerService tsms = null;
if (factoryTest != SystemServer.FACTORY_TEST_LOW_LEVEL) {
try {
@ -271,14 +270,6 @@ class ServerThread extends Thread {
Slog.e(TAG, "Failure starting NetworkManagement Service", e);
}
try {
Slog.i(TAG, "Text Service Manager Service");
tsms = new TextServiceManagerService(context);
ServiceManager.addService(Context.TEXT_SERVICE_MANAGER_SERVICE, tsms);
} catch (Throwable e) {
Slog.e(TAG, "Failure starting Text Service Manager Service", e);
}
try {
Slog.i(TAG, "NetworkStats Service");
networkStats = new NetworkStatsService(context, networkManagement, alarm);
@ -543,7 +534,6 @@ class ServerThread extends Thread {
final LocationManagerService locationF = location;
final CountryDetectorService countryDetectorF = countryDetector;
final NetworkTimeUpdateService networkTimeUpdaterF = networkTimeUpdater;
final TextServiceManagerService textServiceManagerServiceF = tsms;
// We now tell the activity manager it is okay to run third party
// code. It will call back into us once it has gotten to the state
@ -576,7 +566,6 @@ class ServerThread extends Thread {
if (countryDetectorF != null) countryDetectorF.systemReady();
if (throttleF != null) throttleF.systemReady();
if (networkTimeUpdaterF != null) networkTimeUpdaterF.systemReady();
if (textServiceManagerServiceF != null) textServiceManagerServiceF.systemReady();
}
});