diff options
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 75dcf8c8c48d..02c4d5a9cdb2 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -51,6 +51,7 @@ import com.android.internal.os.SamplingProfilerIntegration; import com.android.internal.widget.LockSettingsService; import com.android.server.accessibility.AccessibilityManagerService; import com.android.server.am.ActivityManagerService; +import com.android.server.input.InputManagerService; import com.android.server.net.NetworkPolicyManagerService; import com.android.server.net.NetworkStatsService; import com.android.server.pm.PackageManagerService; @@ -137,6 +138,7 @@ class ServerThread extends Thread { ThrottleService throttle = null; NetworkTimeUpdateService networkTimeUpdater = null; CommonTimeManagementService commonTimeMgmtService = null; + InputManagerService inputManager = null; // Critical services... try { @@ -224,7 +226,8 @@ class ServerThread extends Thread { factoryTest != SystemServer.FACTORY_TEST_LOW_LEVEL, !firstBoot); ServiceManager.addService(Context.WINDOW_SERVICE, wm); - ServiceManager.addService(Context.INPUT_SERVICE, wm.getInputManagerService()); + inputManager = wm.getInputManagerService(); + ServiceManager.addService(Context.INPUT_SERVICE, inputManager); ActivityManagerService.self().setWindowManager(wm); @@ -722,6 +725,7 @@ class ServerThread extends Thread { final TextServicesManagerService textServiceManagerServiceF = tsms; final StatusBarManagerService statusBarF = statusBar; final DreamManagerService dreamyF = dreamy; + final InputManagerService inputManagerF = inputManager; // 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 @@ -833,6 +837,11 @@ class ServerThread extends Thread { } catch (Throwable e) { reportWtf("making DreamManagerService ready", e); } + try { + if (inputManagerF != null) inputManagerF.systemReady(); + } catch (Throwable e) { + reportWtf("making InputManagerService ready", e); + } } }); |