Merge "Maybe fix issue #2881233: reboot loop at boot on stingray"

2 files changed, 2 insertions, 6 deletions

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();
     }
 
     // -------------------------------------------------------------