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

Merge "Fix emulator" into jb-mr1-dev

This commit is contained in:
Andy McFadden 2012-09-12 13:27:00 -07:00 committed by Android (Google) Code Review
parent c272430960 babba18687
commit 2c7c8ba56a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,9 +111,10 @@ HWComposer::HWComposer(
loadFbHalModule();
loadHwcModule();
if (!hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_1) && !mFbDev) {
// If we have no HWC, or a pre-1.1 HWC, an FB dev is mandatory.
if ((!mHwc || !hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_1))
&& !mFbDev) {
ALOGE("ERROR: failed to open framebuffer, aborting");
// FB mandatory on <= 1.0, give up
abort();
}
@ -186,7 +187,9 @@ HWComposer::HWComposer(
}
HWComposer::~HWComposer() {
mHwc->eventControl(mHwc, 0, EVENT_VSYNC, 0);
if (mHwc) {
mHwc->eventControl(mHwc, 0, EVENT_VSYNC, 0);
}
if (mVSyncThread != NULL) {
mVSyncThread->requestExitAndWait();
}