ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 9349b510: am f0c89b28: Merge "Fix HDMI unblank behavior" into jb-mr1-dev 

* commit '9349b5108c3763337868ffc5de51330c00d6db04':
  Fix HDMI unblank behavior
This commit is contained in:
Andy McFadden 2012-10-10 19:39:21 -07:00 committed by Android Git Automerger
parent c6e8452320 9349b5108c
commit 9f997217cf
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
services/surfaceflinger/DisplayHardware/HWComposer.cpp
View File

@ -696,6 +696,7 @@ void HWComposer::disconnectDisplay(int disp) {
free(dd.list);
dd.list = NULL;
dd.framebufferTarget = NULL; // points into dd.list
dd.fbTargetHandle = NULL;
}
}

5
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -772,8 +772,7 @@ void SurfaceFlinger::onHotplugReceived(int type, bool connected) {
}
setTransactionFlags(eDisplayTransactionNeeded);
// we should only receive DisplayDevice::DisplayType from the vsync callback
mEventThread->onHotplugReceived(type, connected);
// Defer EventThread notification until SF has updated mDisplays.
}
}
@ -1130,6 +1129,7 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags)
DisplayDevice::makeCurrent(mEGLDisplay, hw, mEGLContext);
mDisplays.removeItem(draw.keyAt(i));
getHwComposer().disconnectDisplay(draw[i].type);
mEventThread->onHotplugReceived(draw[i].type, false);
} else {
ALOGW("trying to remove the main display");
}
@ -1212,6 +1212,7 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags)
state.viewport, state.frame);
hw->setDisplayName(state.displayName);
mDisplays.add(display, hw);
mEventThread->onHotplugReceived(state.type, true);
}
}
}