resolved conflicts w/ 75986cf9bc merge....

2009-05-15 00:44:45 -07:00
parent e52a5a5fca 75986cf9bc
commit 76879bc234
43 changed files with 4247 additions and 119 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -231,6 +231,14 @@ class ServerThread extends Thread {
                Log.e(TAG, "Failure starting Connectivity Service", e);
            }

+            try {
+              Log.i(TAG, "Starting Accessibility Manager.");
+              ServiceManager.addService(Context.ACCESSIBILITY_SERVICE,
+                      new AccessibilityManagerService(context));
+            } catch (Throwable e) {
+              Log.e(TAG, "Failure starting Accessibility Manager", e);
+            }
+
            try {
                Log.i(TAG, "Starting Notification Manager.");
                ServiceManager.addService(Context.NOTIFICATION_SERVICE,