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

auto import from //branches/cupcake/...@132276

Browse Source
This commit is contained in:
The Android Open Source Project
2009-02-19 10:57:31 -08:00
parent da996f390e
commit 3001a03543
301 changed files with 11400 additions and 9612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,6 +181,7 @@ class ServerThread extends Thread {
StatusBarService statusBar = null;
InputMethodManagerService imm = null;
GadgetService gadget = null;
if (factoryTest != SystemServer.FACTORY_TEST_LOW_LEVEL) {
try {
@@ -309,7 +310,8 @@ class ServerThread extends Thread {
try {
Log.i(TAG, "Starting Gadget Service");
ServiceManager.addService(Context.GADGET_SERVICE, new GadgetService(context));
gadget = new GadgetService(context);
ServiceManager.addService(Context.GADGET_SERVICE, gadget);
} catch (Throwable e) {
Log.e(TAG, "Failure starting Gadget Service", e);
}
@@ -337,6 +339,9 @@ class ServerThread extends Thread {
pm.systemReady();
} catch (RemoteException e) {
}
if (gadget != null) {
gadget.systemReady(safeMode);
}
// After making the following code, third party code may be running...
try {