diff options
author | Jeff Brown <jeffbrown@google.com> | 2012-10-09 16:50:55 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-09 16:50:56 -0700 |
commit | c5b58166e8170a415de108a72acfc432dec1b201 (patch) | |
tree | cafad64d5a1f31de10a6e0b6bf0df5f3799c3dad | |
parent | 45778999c705683ec0fcca3e90c7e9969e081d93 (diff) | |
parent | 3292cae8c37fc8d7cd8bf77fafaa55e6fc7a8cc5 (diff) | |
download | native-c5b58166e8170a415de108a72acfc432dec1b201.tar.gz |
Merge "don't automatically unblank external displays" into jb-mr1-dev
-rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 83674172f3..17c67f9c69 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1212,12 +1212,6 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags) 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); - } } } } |