am 847d2692: am 8aa2e3f1: am ab46eda8: am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev

* commit '847d2692978bb8efcd5335feb3ea27aa87948f42': Ensure we correctly unblank displays when added.
2014-10-10 16:59:00 +00:00
parent ea2a8ba464 847d269297
commit 1a62427231
1 changed files with 4 additions and 1 deletions
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -651,7 +651,10 @@ public final class DisplayManagerService extends SystemService {

        mDisplayDevices.add(device);
        addLogicalDisplayLocked(device);
-        updateDisplayStateLocked(device);
+        Runnable work = updateDisplayStateLocked(device);
+        if (work != null) {
+            work.run();
+        }
        scheduleTraversalLocked(false);
    }