commit 154db5f6358284d917d515f05d4474606b4896b2
author Dianne Hackborn <hackbod@google.com> Thu Jul 29 19:15:19 2010 -0700
committer Dianne Hackborn <hackbod@google.com> Thu Jul 29 19:15:19 2010 -0700
tree 2c611410185ee4bef78964c7eae5c2316fdda2c1
parent 5aa1c034d9bfdb2744f637c4686adf20a7ed9975

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

Change-Id: I4bd88fdd506d061146c441143d39b796a8df2f49

services/java/com/android/server/SystemServer.java

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 @@
         } catch (RemoteException e) {
         }
 
-        wm.initDisplay();
-
         // These are needed to propagate to the runnable below.
         final StatusBarManagerService statusBarF = statusBar;
         final BatteryService batteryF = battery;

services/java/com/android/server/WindowManagerService.java

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 void systemReady() {
-        mPolicy.systemReady();
-    }
-
-    public void initDisplay() {
         synchronized(mWindowMap) {
             if (mDisplay != null) {
                 throw new IllegalStateException("Display already initialized");
@@ -5548,6 +5544,8 @@
             mActivityManager.updateConfiguration(null);
         } catch (RemoteException e) {
         }
+        
+        mPolicy.systemReady();
     }
 
     // -------------------------------------------------------------