From 154db5f6358284d917d515f05d4474606b4896b2 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Thu, 29 Jul 2010 19:15:19 -0700 Subject: Maybe fix issue #2881233: reboot loop at boot on stingray Change-Id: I4bd88fdd506d061146c441143d39b796a8df2f49 --- services/java/com/android/server/SystemServer.java | 2 -- services/java/com/android/server/WindowManagerService.java | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'services') diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index bc1e847..2412b7d 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -475,8 +475,6 @@ class ServerThread extends Thread { } catch (RemoteException e) { } - wm.initDisplay(); - // These are needed to propagate to the runnable below. final StatusBarManagerService statusBarF = statusBar; final BatteryService batteryF = battery; diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java index ba54872..7398f69 100644 --- a/services/java/com/android/server/WindowManagerService.java +++ b/services/java/com/android/server/WindowManagerService.java @@ -5529,10 +5529,6 @@ public class WindowManagerService extends IWindowManager.Stub } public void systemReady() { - mPolicy.systemReady(); - } - - public void initDisplay() { synchronized(mWindowMap) { if (mDisplay != null) { throw new IllegalStateException("Display already initialized"); @@ -5548,6 +5544,8 @@ public class WindowManagerService extends IWindowManager.Stub mActivityManager.updateConfiguration(null); } catch (RemoteException e) { } + + mPolicy.systemReady(); } // ------------------------------------------------------------- -- cgit v1.1