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

am 4af0a709: Merge change 6555 into donut

Browse Source 
Merge commit '4af0a709ee08e8ae43f49d8fc5c9cae142aaf2c4'

* commit '4af0a709ee08e8ae43f49d8fc5c9cae142aaf2c4':
  Make it so the notification manager doesn't mysteriously
This commit is contained in:
Android (Google) Code Review
2009-07-08 17:30:05 -07:00
committed by The Android Open Source Project
parent 706f42c4f8 4af0a709ee
commit afefa49abc
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -194,6 +194,7 @@ class ServerThread extends Thread {
StatusBarService statusBar = null;
InputMethodManagerService imm = null;
AppWidgetService appWidget = null;
NotificationManagerService notification = null;
if (factoryTest != SystemServer.FACTORY_TEST_LOW_LEVEL) {
try {
@@ -244,8 +245,8 @@ class ServerThread extends Thread {
try {
Log.i(TAG, "Starting Notification Manager.");
ServiceManager.addService(Context.NOTIFICATION_SERVICE,
new NotificationManagerService(context, statusBar, hardware));
notification = new NotificationManagerService(context, statusBar, hardware);
ServiceManager.addService(Context.NOTIFICATION_SERVICE, notification);
} catch (Throwable e) {
Log.e(TAG, "Failure starting Notification Manager", e);
}
@@ -352,6 +353,11 @@ class ServerThread extends Thread {
// It is now time to start up the app processes...
boolean safeMode = wm.detectSafeMode();
if (notification != null) {
notification.systemReady();
}
if (statusBar != null) {
statusBar.systemReady();
}