am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev

* commit '704998abbafea84c28c0bcd0c540af87562b4cc9': Ensure we correctly unblank displays when added.
2014-10-09 19:09:01 +00:00
parent 8433b63c02 704998abba
commit ab46eda872
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);
    }