Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c7c8ba5 authored by Andy McFadden's avatar Andy McFadden Committed by Android (Google) Code Review
Browse files

Merge "Fix emulator" into jb-mr1-dev

parents c2724309 babba186

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+6 −3
Original line number Diff line number Diff line
@@ -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() {

    if (mHwc) {

        mHwc->eventControl(mHwc, 0, EVENT_VSYNC, 0);

    }

    if (mVSyncThread != NULL) {

        mVSyncThread->requestExitAndWait();

    }