am 4b187e80: am 8e1b84e7: Merge "Some battery improvements:" into gingerbread

Merge commit '4b187e804fdfdbc825e17646e82e0218e316a339' * commit '4b187e804fdfdbc825e17646e82e0218e316a339': Some battery improvements:
2010-09-20 19:33:06 -07:00
parent 5b138e5984 4b187e804f
commit 48a781a0a5
5 changed files with 107 additions and 20 deletions
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -8325,6 +8325,11 @@ public class WindowManagerService extends IWindowManager.Stub
            return;
        }
        
+        if (mDisplay == null) {
+            // Not yet initialized, nothing to do.
+            return;
+        }
+
        boolean recoveringMemory = false;
        if (mForceRemoves != null) {
            recoveringMemory = true;