commit 70f07572f8ce6b83b167170eea9d500e51549395
author Jeff Brown <jeffbrown@google.com> Tue Oct 09 16:56:21 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 09 16:56:21 2012 -0700
tree 9785f628e36d006cc5cf3dad0705d2cd45ebb69a
parent 98e52bdb18842a7a00e66bf6adb628f2512e2ef0
parent c5b58166e8170a415de108a72acfc432dec1b201

am c5b58166: Merge "don\'t automatically unblank external displays" into jb-mr1-dev

* commit 'c5b58166e8170a415de108a72acfc432dec1b201':
  don't automatically unblank external displays

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 8367417..17c67f9 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1212,12 +1212,6 @@
                                 state.viewport, state.frame);
                         hw->setDisplayName(state.displayName);
                         mDisplays.add(display, hw);
-                        if (hw->getDisplayType() < DisplayDevice::NUM_DISPLAY_TYPES) {
-                            // notify the system that this display is now up
-                            // (note onScreenAcquired() is safe to call from
-                            // here because we're in the main thread)
-                            onScreenAcquired(hw);
-                        }
                     }
                 }
             }